rcolebaugh / rpms / openssh

Forked from rpms/openssh 2 years ago
Clone

Blame SOURCES/openssh-6.6.1p1-servconf-parser.patch

017ff1
diff --git a/servconf.c b/servconf.c
017ff1
index b7f3294..bc1e909 100644
017ff1
--- a/servconf.c
017ff1
+++ b/servconf.c
017ff1
@@ -1550,7 +1550,7 @@ process_server_config_line(ServerOptions *options, char *line,
017ff1
 		break;
017ff1
 
017ff1
 	case sForceCommand:
017ff1
-		if (cp == NULL)
017ff1
+		if (cp == NULL || *cp == '\0')
017ff1
 			fatal("%.200s line %d: Missing argument.", filename,
017ff1
 			    linenum);
017ff1
 		len = strspn(cp, WHITESPACE);
017ff1
@@ -1595,7 +1595,7 @@ process_server_config_line(ServerOptions *options, char *line,
017ff1
 		break;
017ff1
 
017ff1
 	case sVersionAddendum:
017ff1
-		if (cp == NULL)
017ff1
+		if (cp == NULL || *cp == '\0')
017ff1
 			fatal("%.200s line %d: Missing argument.", filename,
017ff1
 			    linenum);
017ff1
 		len = strspn(cp, WHITESPACE);
017ff1
@@ -1630,6 +1630,8 @@ process_server_config_line(ServerOptions *options, char *line,
017ff1
 		break;
017ff1
 
017ff1
 	case sAuthenticationMethods:
017ff1
+		if (cp == NULL || *cp == '\0')
017ff1
+			fatal("%.200s line %d: Missing argument.", filename, linenum);
017ff1
 		if (*activep && options->num_auth_methods == 0) {
017ff1
 			while ((arg = strdelim(&cp)) && *arg != '\0') {
017ff1
 				if (options->num_auth_methods >=