Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections (#861818)

This commit is contained in:
Petr Lautrbach 2012-11-26 16:18:50 +01:00
parent 460af950e1
commit a09799e377
2 changed files with 15 additions and 0 deletions

12
openssh-5.9p1-ipqos.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up openssh-5.9p1/packet.c.ipqos openssh-5.9p1/packet.c
--- openssh-5.9p1/packet.c.ipqos 2012-11-26 16:15:50.664604385 +0100
+++ openssh-5.9p1/packet.c 2012-11-26 16:15:50.793603960 +0100
@@ -435,8 +435,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))

View File

@ -214,6 +214,8 @@ Patch900: openssh-5.9p1-gssapi-canohost.patch
Patch901: openssh-5.9p1-kuserok.patch Patch901: openssh-5.9p1-kuserok.patch
#https://bugzilla.redhat.com/show_bug.cgi?id=841065 #https://bugzilla.redhat.com/show_bug.cgi?id=841065
Patch902: openssh-5.9p1-man-moduli.patch Patch902: openssh-5.9p1-man-moduli.patch
#https://bugzilla.redhat.com/show_bug.cgi?id=861818
Patch903: openssh-5.9p1-ipqos.patch
#--- #---
#https://bugzilla.mindrot.org/show_bug.cgi?id=1604 #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
@ -461,6 +463,7 @@ popd
%patch900 -p1 -b .canohost %patch900 -p1 -b .canohost
%patch901 -p1 -b .kuserok %patch901 -p1 -b .kuserok
%patch902 -p1 -b .man-moduli %patch902 -p1 -b .man-moduli
%patch903 -p1 -b .ipqos
%if 0 %if 0
# Nothing here yet # Nothing here yet