From aae6c614da614eb10ced16505f35410671c95d9d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 6 Dec 1999 11:47:28 +1100 Subject: - Merged OpenBSD CVS changes: - [auth-krb4.c auth-passwd.c auth-skey.c ssh. move skey-auth from auth-passwd.c to auth-s - [auth-rsa.c] warn only about mismatch if key is _used_ warn about keysize-mismatch with log() not channels.c readconf.c readconf.h ssh.c ssh. ports are u_short - [hostfile.c] indent, shorter warning - [nchan.c] use error() for internal errors - [packet.c] set loglevel for SSH_MSG_DISCONNECT to log( serverloop.c indent - [ssh-add.1 ssh-add.c ssh.h] document , reasonable default - [ssh.1] CheckHostIP is not available for connects v - [sshconnect.c] typo easier to read client code for passwd and s turn of checkhostip for proxy connects, sin --- readconf.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'readconf.h') diff --git a/readconf.h b/readconf.h index d594a46d..09f05140 100644 --- a/readconf.h +++ b/readconf.h @@ -13,7 +13,7 @@ * */ -/* RCSID("$Id: readconf.h,v 1.5 1999/11/25 00:54:59 damien Exp $"); */ +/* RCSID("$Id: readconf.h,v 1.6 1999/12/06 00:47:29 damien Exp $"); */ #ifndef READCONF_H #define READCONF_H @@ -21,9 +21,9 @@ /* Data structure for representing a forwarding request. */ typedef struct { - int port; /* Port to forward. */ - char *host; /* Host to connect. */ - int host_port; /* Port to connect on host. */ + u_short port; /* Port to forward. */ + char *host; /* Host to connect. */ + u_short host_port; /* Port to connect on host. */ } Forward; /* Data structure for representing option data. */ @@ -123,15 +123,15 @@ read_config_file(const char *filename, const char *host, * error. */ void -add_local_forward(Options * options, int port, const char *host, - int host_port); +add_local_forward(Options * options, u_short port, const char *host, + u_short host_port); /* * Adds a remote TCP/IP port forward to options. Never returns if there is * an error. */ void -add_remote_forward(Options * options, int port, const char *host, - int host_port); +add_remote_forward(Options * options, u_short port, const char *host, + u_short host_port); #endif /* READCONF_H */ -- cgit v1.2.3