diff options
author | djm <djm> | 2012-03-08 23:28:07 +0000 |
---|---|---|
committer | djm <djm> | 2012-03-08 23:28:07 +0000 |
commit | e6925baa18fd18d11784f0b038912afb2ce41338 (patch) | |
tree | d190c6e9948b9213f5cb1a991c6e6d38206c945a | |
parent | 048593ec57e6f7ee93f4ae986c7b5261602ce9e8 (diff) | |
download | openssh-e6925baa18fd18d11784f0b038912afb2ce41338.tar.gz |
- (djm) [packet.c] bz#1963: Fix IPQoS not being set on non-mapped v4-in-v6
addressed connections. ok dtucker@
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | packet.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 @@ -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)) |