diff options
Diffstat (limited to 'security/openssh/files/patch-sshconnect.c')
| -rw-r--r-- | security/openssh/files/patch-sshconnect.c | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/security/openssh/files/patch-sshconnect.c b/security/openssh/files/patch-sshconnect.c index 3b0017faab5b..d3e2e03ca080 100644 --- a/security/openssh/files/patch-sshconnect.c +++ b/security/openssh/files/patch-sshconnect.c @@ -1,28 +1,6 @@ ---- sshconnect.c.orig Mon Jan 21 16:13:51 2002 -+++ sshconnect.c Fri Mar 8 18:14:50 2002 -@@ -43,15 +43,21 @@ - sockaddr_ntop(struct sockaddr *sa) - { - void *addr; -+#ifdef INET6 - static char addrbuf[INET6_ADDRSTRLEN]; -+#else -+ static char addrbuf[INET_ADDRSTRLEN]; -+#endif - - switch (sa->sa_family) { - case AF_INET: - addr = &((struct sockaddr_in *)sa)->sin_addr; - break; -+#ifdef INET6 - case AF_INET6: - addr = &((struct sockaddr_in6 *)sa)->sin6_addr; - break; -+#endif - default: - /* This case should be protected against elsewhere */ - abort(); /* XXX abort is bad -- do something else */ -@@ -291,7 +297,11 @@ +--- sshconnect.c.orig Wed Jun 19 02:27:55 2002 ++++ sshconnect.c Fri Jun 21 23:02:29 2002 +@@ -279,7 +279,11 @@ /* Loop through addresses for this host, and try each one in sequence until the connection succeeds. */ for (ai = aitop; ai; ai = ai->ai_next) { @@ -34,7 +12,7 @@ continue; if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop, sizeof(ntop), strport, sizeof(strport), -@@ -537,10 +547,12 @@ +@@ -516,10 +520,12 @@ local = (ntohl(((struct sockaddr_in *)hostaddr)-> sin_addr.s_addr) >> 24) == IN_LOOPBACKNET; break; |