diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2015-04-23 04:53:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-29 18:14:23 +1000 |
commit | bd902b8473e1168f19378d5d0ae68d0c203525df (patch) | |
tree | 9bd52d1d5de54cd98d021293573702102b419bd4 /servconf.c | |
parent | ca42c1758575e592239de1d5755140e054b91a0d (diff) | |
download | openssh-git-bd902b8473e1168f19378d5d0ae68d0c203525df.tar.gz |
upstream commit
Check for and reject missing arguments for
VersionAddendum and ForceCommand. bz#2281, patch from plautrba at redhat com,
ok djm@
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 <ylo@cs.hut.fi>, 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); |