diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | readconf.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -5,6 +5,9 @@ - jmc@cvs.openbsd.org 2005/03/02 11:45:01 [ssh.1] missing word; + - djm@cvs.openbsd.org 2005/03/04 08:48:06 + [readconf.c] + fix SendEnv config parsing bug found by Roumen Petrov; ok dtucker@ 20050302 - (djm) OpenBSD CVS sync: @@ -2274,4 +2277,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3690 2005/03/05 00:22:36 djm Exp $ +$Id: ChangeLog,v 1.3691 2005/03/05 00:22:50 djm Exp $ @@ -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" @@ -775,6 +775,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); |