summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/readconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2005-03-04 08:48:07 +0000
committerDamien Miller <djm@cvs.openbsd.org>2005-03-04 08:48:07 +0000
commitd1d59fc36bd46b4d5550e8131a010f302bfdcc3b (patch)
treede54a31dba049aa5bf88998f2b171e2409ee7f3f /usr.bin/ssh/readconf.c
parente6777d2786df15991f7708b1d2f724aa3348212a (diff)
fix SendEnv config parsing bug found by Roumen Petrov; ok dtucker@
Diffstat (limited to 'usr.bin/ssh/readconf.c')
-rw-r--r--usr.bin/ssh/readconf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index b953d7f3916..7aae0c269cd 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.136 2005/03/01 10:40:26 djm Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.137 2005/03/04 08:48:06 djm Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -773,6 +773,8 @@ parse_int:
if (strchr(arg, '=') != NULL)
fatal("%s line %d: Invalid environment name.",
filename, linenum);
+ if (!*activep)
+ continue;
if (options->num_send_env >= MAX_SEND_ENV)
fatal("%s line %d: too many send env.",
filename, linenum);