diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
| commit | d4ecd1085791f1e31b106a2546b08647fd6a2a17 (patch) | |
| tree | 15c858fecc18a67f9dcc639fd5be6afa6ed7037f /crypto/openssh/canohost.c | |
| parent | f8a2a7f14a354d1231b54c452245604bf11bed62 (diff) | |
| download | src-d4ecd1085791f1e31b106a2546b08647fd6a2a17.tar.gz src-d4ecd1085791f1e31b106a2546b08647fd6a2a17.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=149753
Diffstat (limited to 'crypto/openssh/canohost.c')
| -rw-r--r-- | crypto/openssh/canohost.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/openssh/canohost.c b/crypto/openssh/canohost.c index 94d666432f0e..c27086bfdc59 100644 --- a/crypto/openssh/canohost.c +++ b/crypto/openssh/canohost.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: canohost.c,v 1.42 2005/02/18 03:05:53 djm Exp $"); +RCSID("$OpenBSD: canohost.c,v 1.44 2005/06/17 02:44:32 djm Exp $"); #include "packet.h" #include "xmalloc.h" @@ -143,7 +143,8 @@ check_ip_options(int sock, char *ipaddr) u_char options[200]; char text[sizeof(options) * 3 + 1]; socklen_t option_size; - int i, ipproto; + u_int i; + int ipproto; struct protoent *ip; if ((ip = getprotobyname("ip")) != NULL) @@ -173,7 +174,7 @@ ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len) struct in_addr inaddr; u_int16_t port; - if (addr->ss_family != AF_INET6 || + if (addr->ss_family != AF_INET6 || !IN6_IS_ADDR_V4MAPPED(&a6->sin6_addr)) return; @@ -346,7 +347,7 @@ get_sock_port(int sock, int local) } else { if (getpeername(sock, (struct sockaddr *)&from, &fromlen) < 0) { debug("getpeername failed: %.100s", strerror(errno)); - cleanup_exit(255); + return -1; } } |