diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -5,6 +5,9 @@ | |||
5 | - jmc@cvs.openbsd.org 2005/03/02 11:45:01 | 5 | - jmc@cvs.openbsd.org 2005/03/02 11:45:01 |
6 | [ssh.1] | 6 | [ssh.1] |
7 | missing word; | 7 | missing word; |
8 | - djm@cvs.openbsd.org 2005/03/04 08:48:06 | ||
9 | [readconf.c] | ||
10 | fix SendEnv config parsing bug found by Roumen Petrov; ok dtucker@ | ||
8 | 11 | ||
9 | 20050302 | 12 | 20050302 |
10 | - (djm) OpenBSD CVS sync: | 13 | - (djm) OpenBSD CVS sync: |
@@ -2274,4 +2277,4 @@ | |||
2274 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2277 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2275 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2278 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2276 | 2279 | ||
2277 | $Id: ChangeLog,v 1.3690 2005/03/05 00:22:36 djm Exp $ | 2280 | $Id: ChangeLog,v 1.3691 2005/03/05 00:22:50 djm Exp $ |
diff --git a/readconf.c b/readconf.c index e50a42222..7173a8c23 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.136 2005/03/01 10:40:26 djm Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.137 2005/03/04 08:48:06 djm Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -775,6 +775,8 @@ parse_int: | |||
775 | if (strchr(arg, '=') != NULL) | 775 | if (strchr(arg, '=') != NULL) |
776 | fatal("%s line %d: Invalid environment name.", | 776 | fatal("%s line %d: Invalid environment name.", |
777 | filename, linenum); | 777 | filename, linenum); |
778 | if (!*activep) | ||
779 | continue; | ||
778 | if (options->num_send_env >= MAX_SEND_ENV) | 780 | if (options->num_send_env >= MAX_SEND_ENV) |
779 | fatal("%s line %d: too many send env.", | 781 | fatal("%s line %d: too many send env.", |
780 | filename, linenum); | 782 | filename, linenum); |