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

This commit is contained in:
Jakub Jelen 2015-01-12 10:56:26 +01:00 committed by Petr Lautrbach
parent fd06d69c6a
commit b9d68e7db4
2 changed files with 27 additions and 0 deletions

View File

@ -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

View File

@ -218,6 +218,8 @@ Patch917: openssh-6.6.1p1-cisco-dh-keys.patch
Patch918: openssh-6.6.1p1-log-in-chroot.patch
# scp file into non-existing directory (#1142223)
Patch919: openssh-6.6.1p1-scp-non-existing-directory.patch
# Config parser shouldn't accept ip/port syntax (#1130733)
Patch920: openssh-6.6.1p1-ip-port-config-parser.patch
License: BSD
Group: Applications/Internet
@ -430,6 +432,7 @@ popd
%patch917 -p1 -b .cisco-dh
%patch918 -p1 -b .log-in-chroot
%patch919 -p1 -b .scp
%patch920 -p1 -b .config
%patch200 -p1 -b .audit
%patch201 -p1 -b .audit-fps