summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sshd.c10
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f3b0ea9e..cea5164e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120080119 120080119
2 - (djm) Silence noice from expr in ssh-copy-id; patch from 2 - (djm) Silence noice from expr in ssh-copy-id; patch from
3 mikel AT mikelward.com 3 mikel AT mikelward.com
4 - (djm) Only listen for IPv6 connections on AF_INET6 sockets; patch from
5 tsr2600 AT gmail.com
4 6
520080102 720080102
6 - (dtucker) [configure.ac] Fix message for -fstack-protector-all test. 8 - (dtucker) [configure.ac] Fix message for -fstack-protector-all test.
@@ -3523,4 +3525,4 @@
3523 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3525 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3524 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3526 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3525 3527
3526$Id: ChangeLog,v 1.4818 2008/01/19 18:52:04 djm Exp $ 3528$Id: ChangeLog,v 1.4819 2008/01/19 21:56:00 djm Exp $
diff --git a/sshd.c b/sshd.c
index 9019411ac..27c38ba53 100644
--- a/sshd.c
+++ b/sshd.c
@@ -976,6 +976,16 @@ server_listen(void)
976 &on, sizeof(on)) == -1) 976 &on, sizeof(on)) == -1)
977 error("setsockopt SO_REUSEADDR: %s", strerror(errno)); 977 error("setsockopt SO_REUSEADDR: %s", strerror(errno));
978 978
979#ifdef IPV6_V6ONLY
980 /* Only communicate in IPv6 over AF_INET6 sockets. */
981 if (ai->ai_family == AF_INET6) {
982 if (setsockopt(listen_sock, IPPROTO_IPV6, IPV6_V6ONLY,
983 &on, sizeof(on)) == -1)
984 error("setsockopt IPV6_V6ONLY: %s",
985 strerror(errno));
986 }
987#endif
988
979 debug("Bind to port %s on %s.", strport, ntop); 989 debug("Bind to port %s on %s.", strport, ntop);
980 990
981 /* Bind the socket to the desired port. */ 991 /* Bind the socket to the desired port. */