tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
addressed connections. ok dtucker@
This commit is contained in:
Damien Miller 2012-03-09 10:28:07 +11:00
parent 7bf7b889b3
commit 54c38d24c6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
- (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux - (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux
systems where sshd is run in te wrong context. Patch from Sven systems where sshd is run in te wrong context. Patch from Sven
Vermeulen; ok dtucker@ Vermeulen; ok dtucker@
- (djm) [packet.c] bz#1963: Fix IPQoS not being set on non-mapped v4-in-v6
addressed connections. ok dtucker@
20120224 20120224
- (dtucker) [audit-bsm.c configure.ac] bug #1968: enable workarounds for BSM - (dtucker) [audit-bsm.c configure.ac] bug #1968: enable workarounds for BSM

2
packet.c
View File

@ -432,8 +432,6 @@ packet_connection_af(void)
if (getsockname(active_state->connection_out, (struct sockaddr *)&to, if (getsockname(active_state->connection_out, (struct sockaddr *)&to,
&tolen) < 0) &tolen) < 0)
return 0; return 0;
if (to.ss_family == AF_INET)
return 1;
#ifdef IPV4_IN_IPV6 #ifdef IPV4_IN_IPV6
if (to.ss_family == AF_INET6 && if (to.ss_family == AF_INET6 &&
IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&to)->sin6_addr)) IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&to)->sin6_addr))