From bd902b8473e1168f19378d5d0ae68d0c203525df Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Thu, 23 Apr 2015 04:53:53 +0000 Subject: upstream commit Check for and reject missing arguments for VersionAddendum and ForceCommand. bz#2281, patch from plautrba at redhat com, ok djm@ --- servconf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servconf.c b/servconf.c index bc1350f76..3014361ea 100644 --- a/servconf.c +++ b/servconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.261 2015/04/17 04:12:35 dtucker Exp $ */ +/* $OpenBSD: servconf.c,v 1.262 2015/04/23 04:53:53 dtucker Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved @@ -1612,7 +1612,7 @@ process_server_config_line(ServerOptions *options, char *line, break; case sForceCommand: - if (cp == NULL) + if (cp == NULL || *cp == '\0') fatal("%.200s line %d: Missing argument.", filename, linenum); len = strspn(cp, WHITESPACE); @@ -1657,7 +1657,7 @@ process_server_config_line(ServerOptions *options, char *line, break; case sVersionAddendum: - if (cp == NULL) + if (cp == NULL || *cp == '\0') fatal("%.200s line %d: Missing argument.", filename, linenum); len = strspn(cp, WHITESPACE); -- cgit v1.2.3