From a09799e37708f83de78ddc824ba54c48c1229e41 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Mon, 26 Nov 2012 16:18:50 +0100 Subject: [PATCH] Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections (#861818) --- openssh-5.9p1-ipqos.patch | 12 ++++++++++++ openssh.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 openssh-5.9p1-ipqos.patch 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