diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-03-08 17:21:59 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-03-08 17:21:59 +0000 |
| commit | fa10b7c0f8d32972b29dda2f550f966a87331793 (patch) | |
| tree | ca9b3fc9763db6778f99a746d1da5e1402da6553 /security | |
| parent | New port of gkrellshoot, a screen locking and screen capture plugin for (diff) | |
- Add more INET6 #ifdef's
- Suggested patch modified and extended
PR: 35673
Submitted by: scheidell@secnap.net
Notes
Notes:
svn path=/head/; revision=55735
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/files/patch-at | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/security/openssh/files/patch-at b/security/openssh/files/patch-at index e4a81598a8f8..3b0017faab5b 100644 --- a/security/openssh/files/patch-at +++ b/security/openssh/files/patch-at @@ -1,6 +1,40 @@ ---- sshconnect.c.orig Wed Jul 25 16:35:18 2001 -+++ sshconnect.c Wed Oct 3 12:42:20 2001 -@@ -567,10 +567,12 @@ +--- 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 @@ + /* Loop through addresses for this host, and try each one in + sequence until the connection succeeds. */ + for (ai = aitop; ai; ai = ai->ai_next) { ++#ifdef INET6 + if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) ++#else ++ if (ai->ai_family != AF_INET) ++#endif + continue; + if (getnameinfo(ai->ai_addr, ai->ai_addrlen, + ntop, sizeof(ntop), strport, sizeof(strport), +@@ -537,10 +547,12 @@ local = (ntohl(((struct sockaddr_in *)hostaddr)-> sin_addr.s_addr) >> 24) == IN_LOOPBACKNET; break; |