summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Lautrbach <plautrba@redhat.com>2012-11-26 15:18:50 (GMT)
committerPetr Lautrbach <plautrba@redhat.com>2012-11-26 15:18:50 (GMT)
commita09799e37708f83de78ddc824ba54c48c1229e41 (patch)
tree571e4cb956fb4e4a0340aa2875d583bc30489078
parent460af950e1b697443efa7bac178223b8d388b2ae (diff)
downloadopenssh-a09799e37708f83de78ddc824ba54c48c1229e41.zip
openssh-a09799e37708f83de78ddc824ba54c48c1229e41.tar.gz
openssh-a09799e37708f83de78ddc824ba54c48c1229e41.tar.xz
Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections (#861818)
-rw-r--r--openssh-5.9p1-ipqos.patch12
-rw-r--r--openssh.spec3
2 files changed, 15 insertions, 0 deletions
diff --git a/openssh-5.9p1-ipqos.patch b/openssh-5.9p1-ipqos.patch
new file mode 100644
index 0000000..6782876
--- /dev/null
+++ b/openssh-5.9p1-ipqos.patch
@@ -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))
diff --git a/openssh.spec b/openssh.spec
index 62c9574..c52e4cc 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -214,6 +214,8 @@ Patch900: openssh-5.9p1-gssapi-canohost.patch
Patch901: openssh-5.9p1-kuserok.patch
#https://bugzilla.redhat.com/show_bug.cgi?id=841065
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
@@ -461,6 +463,7 @@ popd
%patch900 -p1 -b .canohost
%patch901 -p1 -b .kuserok
%patch902 -p1 -b .man-moduli
+%patch903 -p1 -b .ipqos
%if 0
# Nothing here yet