summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-03-09 10:28:07 +1100
committerDamien Miller <djm@mindrot.org>2012-03-09 10:28:07 +1100
commit54c38d24c6e748b100ba305a3b15e0085f52c7d4 (patch)
treeadd9e484c5556483b9f7796a58c08838f5632843
parent7bf7b889b3bd2c4c226b8ee39b1e9abfca3d5f13 (diff)
- (djm) [packet.c] bz#1963: Fix IPQoS not being set on non-mapped v4-in-v6
addressed connections. ok dtucker@
-rw-r--r--ChangeLog2
-rw-r--r--packet.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 97b39aaa..03c2674f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
- (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux
systems where sshd is run in te wrong context. Patch from Sven
Vermeulen; ok dtucker@
+ - (djm) [packet.c] bz#1963: Fix IPQoS not being set on non-mapped v4-in-v6
+ addressed connections. ok dtucker@
20120224
- (dtucker) [audit-bsm.c configure.ac] bug #1968: enable workarounds for BSM
diff --git a/packet.c b/packet.c
index 2f85232a..d0c66fe5 100644
--- a/packet.c
+++ b/packet.c
@@ -432,8 +432,6 @@ packet_connection_af(void)
if (getsockname(active_state->connection_out, (struct sockaddr *)&to,
&tolen) < 0)
return 0;
- if (to.ss_family == AF_INET)
- return 1;
#ifdef IPV4_IN_IPV6
if (to.ss_family == AF_INET6 &&
IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&to)->sin6_addr))