- (djm) [packet.c] bz#1963: Fix IPQoS not being set on non-mapped v4-in-v6

addressed connections. ok dtucker@
2012-03-09 10:28:07 +11:00 · 2012-03-09 10:28:07 +11:00 · 54c38d24c6
parent 7bf7b889b3
commit 54c38d24c6
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -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
--- 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))