Bug #2281 resolved upstream
This commit is contained in:
parent
178ce15f5a
commit
05bc93847e
@ -1,12 +0,0 @@
|
|||||||
diff -up openssh/servconf.c.servconf openssh/servconf.c
|
|
||||||
--- openssh/servconf.c.servconf 2015-06-24 11:26:26.186527736 +0200
|
|
||||||
+++ openssh/servconf.c 2015-06-24 11:26:39.847493075 +0200
|
|
||||||
@@ -1815,6 +1815,8 @@ process_server_config_line(ServerOptions
|
|
||||||
break;
|
|
||||||
|
|
||||||
case sAuthenticationMethods:
|
|
||||||
+ if (cp == NULL || *cp == '\0')
|
|
||||||
+ fatal("%.200s line %d: Missing argument.", filename, linenum);
|
|
||||||
if (options->num_auth_methods == 0) {
|
|
||||||
while ((arg = strdelim(&cp)) && *arg != '\0') {
|
|
||||||
if (options->num_auth_methods >=
|
|
@ -188,9 +188,6 @@ Patch900: openssh-6.1p1-gssapi-canohost.patch
|
|||||||
Patch901: openssh-6.6p1-kuserok.patch
|
Patch901: openssh-6.6p1-kuserok.patch
|
||||||
# Use tty allocation for a remote scp (#985650)
|
# Use tty allocation for a remote scp (#985650)
|
||||||
Patch906: openssh-6.4p1-fromto-remote.patch
|
Patch906: openssh-6.4p1-fromto-remote.patch
|
||||||
# fix parsing of empty options in sshd_conf
|
|
||||||
# https://bugzilla.mindrot.org/show_bug.cgi?id=2281
|
|
||||||
Patch914: openssh-6.6.1p1-servconf-parser.patch
|
|
||||||
# privsep_preauth: use SELinux context from selinux-policy (#1008580)
|
# privsep_preauth: use SELinux context from selinux-policy (#1008580)
|
||||||
Patch916: openssh-6.6.1p1-selinux-contexts.patch
|
Patch916: openssh-6.6.1p1-selinux-contexts.patch
|
||||||
# use different values for DH for Cisco servers (#1026430)
|
# use different values for DH for Cisco servers (#1026430)
|
||||||
@ -456,7 +453,6 @@ popd
|
|||||||
%patch900 -p1 -b .canohost
|
%patch900 -p1 -b .canohost
|
||||||
%patch901 -p1 -b .kuserok
|
%patch901 -p1 -b .kuserok
|
||||||
%patch906 -p1 -b .fromto-remote
|
%patch906 -p1 -b .fromto-remote
|
||||||
%patch914 -p1 -b .servconf
|
|
||||||
%patch916 -p1 -b .contexts
|
%patch916 -p1 -b .contexts
|
||||||
#%patch917 -p1 -b .cisco-dh # investigate
|
#%patch917 -p1 -b .cisco-dh # investigate
|
||||||
%patch918 -p1 -b .log-in-chroot
|
%patch918 -p1 -b .log-in-chroot
|
||||||
|
Loading…
Reference in New Issue
Block a user