Fix config parser for ip:port values (#1130733)
This commit is contained in:
parent
87ef7b8238
commit
6b64f7566c
24
openssh-6.4p1-ip-port-config-parser.patch
Normal file
24
openssh-6.4p1-ip-port-config-parser.patch
Normal 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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user