[openssh/f20] Fix config parser for ip:port values (#1130733)

[Petr Lautrbach]

commit 6b64f7566cf13eefdda56977c0a65731fb9f268b
Author: Jakub Jelen <jjelen at redhat.com>
Date:   Mon Jan 12 10:56:26 2015 +0100

    Fix config parser for ip:port values (#1130733)

 openssh-6.4p1-ip-port-config-parser.patch |   24 ++++++++++++++++++++++++
 openssh.spec                              |    3 +++
 2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/openssh-6.4p1-ip-port-config-parser.patch b/openssh-6.4p1-ip-port-config-parser.patch
new file mode 100644
index 0000000..d2746bf
--- /dev/null
+++ b/openssh-6.4p1-ip-port-config-parser.patch
@@ -0,0 +1,24 @@
+diff --git a/misc.c b/misc.c
+index 2f11de4..36402d1 100644
+--- a/misc.c
++++ b/misc.c
+@@ -396,7 +396,7 @@ hpdelim(char **cp)
+ 			return NULL;
+ 		else
+ 			s++;
+-	} else if ((s = strpbrk(s, ":/")) == NULL)
++	} else if ((s = strpbrk(s, ":")) == NULL)
+ 		s = *cp + strlen(*cp); /* skip to end (see first case below) */
+ 
+ 	switch (*s) {
+@@ -405,7 +405,6 @@ hpdelim(char **cp)
+ 		break;
+ 
+ 	case ':':
+-	case '/':
+ 		*s = '\0';	/* terminate */
+ 		*cp = s + 1;
+ 		break;
+-- 
+2.1.0
+
diff --git a/openssh.spec b/openssh.spec
index c659d46..9a58b97 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -219,6 +219,8 @@ Patch916: openssh-6.4p1-cisco-dh-keys.patch
 Patch917: openssh-6.4p1-sftp-symlink-prepend-relative-links.patch
 # scp file into non-existing directory (#1142223)
 Patch918: openssh-6.4p1-scp-non-existing-directory.patch
+# Config parser shouldn't accept ip/port syntax (#1130733)
+Patch919: openssh-6.4p1-ip-port-config-parser.patch
 
 License: BSD
 Group: Applications/Internet
@@ -455,6 +457,7 @@ popd
 %patch916 -p1 -b .cisco-dh
 %patch917 -p1 -b .sftp
 %patch918 -p1 -b .scp
+%patch919 -p1 -b .config
 
 
 %if 0