rpms/openssh/devel openssh-5.2p1-allow-ip-opts.patch, NONE, 1.1 openssh.spec, 1.162, 1.163 openssh-4.3p2-allow-ip-opts.patch, 1.1, NONE

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8156

Modified Files:
	openssh.spec 
Added Files:
	openssh-5.2p1-allow-ip-opts.patch 
Removed Files:
	openssh-4.3p2-allow-ip-opts.patch 
Log Message:
add correct patch for ip-opts


openssh-5.2p1-allow-ip-opts.patch:
 canohost.c |   27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

--- NEW FILE openssh-5.2p1-allow-ip-opts.patch ---
diff -up openssh-5.2p1/canohost.c.ip-opts openssh-5.2p1/canohost.c
--- openssh-5.2p1/canohost.c.ip-opts	2009-02-14 06:28:21.000000000 +0100
+++ openssh-5.2p1/canohost.c	2009-09-01 15:31:29.000000000 +0200
@@ -169,12 +169,27 @@ check_ip_options(int sock, char *ipaddr)
 	option_size = sizeof(options);
 	if (getsockopt(sock, ipproto, IP_OPTIONS, options,
 	    &option_size) >= 0 && option_size != 0) {
-		text[0] = '\0';
-		for (i = 0; i < option_size; i++)
-			snprintf(text + i*3, sizeof(text) - i*3,
-			    " %2.2x", options[i]);
-		fatal("Connection from %.100s with IP options:%.800s",
-		    ipaddr, text);
+		i = 0;
+		do {
+			switch (options[i]) {
+				case 0:
+				case 1:
+					++i;
+					break;
+				case 131:
+				case 137:
+				/* Fail, fatally, if we detect either loose or strict
+			 	 * source routing options. */
+					text[0] = '\0';
+					for (i = 0; i < option_size; i++)
+						snprintf(text + i*3, sizeof(text) - i*3,
+							" %2.2x", options[i]);
+					fatal("Connection from %.100s with IP options:%.800s",
+						ipaddr, text);
+				default:
+					i += options[i + 1];
+			}
+		} while (i < option_size);
 	}
 #endif /* IP_OPTIONS */
 }


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- openssh.spec	1 Sep 2009 14:02:15 -0000	1.162
+++ openssh.spec	1 Sep 2009 18:51:41 -0000	1.163
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 22%{?dist}%{?rescue_rel}
+Release: 23%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -468,6 +468,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep  1 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-23
+- add correct patch for ip-opts
+
 * Tue Sep  1 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-22
 - replace ip-opts patch by an upstream candidate version
 


--- openssh-4.3p2-allow-ip-opts.patch DELETED ---