diff options
author | Damien Miller <djm@mindrot.org> | 2005-06-17 12:59:34 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-06-17 12:59:34 +1000 |
commit | eccb9de72aa29da5a3fad87a4287b32438689c1f (patch) | |
tree | 9b8ef20a7e454b984e0ad67b54b2bdc5577aa2fa /canohost.c | |
parent | 677257fe07dd2b9a58817e1d42fc2c25bb618a4d (diff) |
- djm@cvs.openbsd.org 2005/06/17 02:44:33
[auth-rsa.c auth.c auth1.c auth2-chall.c auth2-gss.c authfd.c authfile.c]
[bufaux.c canohost.c channels.c cipher.c clientloop.c dns.c gss-serv.c]
[kex.c kex.h key.c mac.c match.c misc.c packet.c packet.h scp.c]
[servconf.c session.c session.h sftp-client.c sftp-server.c sftp.c]
[ssh-keyscan.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c]
make this -Wsign-compare clean; ok avsm@ markus@
NB. auth1.c changes not committed yet (conflicts with uncommitted sync)
NB2. more work may be needed to make portable Wsign-compare clean
Diffstat (limited to 'canohost.c')
-rw-r--r-- | canohost.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/canohost.c b/canohost.c index c3ab45556..04dc3d182 100644 --- a/canohost.c +++ b/canohost.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: canohost.c,v 1.43 2005/06/16 08:00:00 markus Exp $"); | 15 | RCSID("$OpenBSD: canohost.c,v 1.44 2005/06/17 02:44:32 djm Exp $"); |
16 | 16 | ||
17 | #include "packet.h" | 17 | #include "packet.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -143,7 +143,8 @@ check_ip_options(int sock, char *ipaddr) | |||
143 | u_char options[200]; | 143 | u_char options[200]; |
144 | char text[sizeof(options) * 3 + 1]; | 144 | char text[sizeof(options) * 3 + 1]; |
145 | socklen_t option_size; | 145 | socklen_t option_size; |
146 | int i, ipproto; | 146 | u_int i; |
147 | int ipproto; | ||
147 | struct protoent *ip; | 148 | struct protoent *ip; |
148 | 149 | ||
149 | if ((ip = getprotobyname("ip")) != NULL) | 150 | if ((ip = getprotobyname("ip")) != NULL) |