diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | servconf.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -21,6 +21,10 @@ | |||
21 | [servconf.c] | 21 | [servconf.c] |
22 | Make PermitOpen work with multiple values like the man pages says. | 22 | Make PermitOpen work with multiple values like the man pages says. |
23 | bz #1267 with details from peter at dmtz.com, with & ok djm@ | 23 | bz #1267 with details from peter at dmtz.com, with & ok djm@ |
24 | - dtucker@cvs.openbsd.org 2006/12/14 10:01:14 | ||
25 | [servconf.c] | ||
26 | Make "PermitOpen all" first-match within a block to match the way other | ||
27 | options work. ok markus@ djm@ | ||
24 | 28 | ||
25 | 20061205 | 29 | 20061205 |
26 | - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would | 30 | - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would |
@@ -2641,4 +2645,4 @@ | |||
2641 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2645 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2642 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2646 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2643 | 2647 | ||
2644 | $Id: ChangeLog,v 1.4596 2007/01/05 05:28:36 djm Exp $ | 2648 | $Id: ChangeLog,v 1.4597 2007/01/05 05:29:02 djm Exp $ |
diff --git a/servconf.c b/servconf.c index 83b634976..872ff4a87 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.166 2006/12/13 08:34:39 dtucker Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.167 2006/12/14 10:01:14 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -1220,14 +1220,14 @@ parse_flag: | |||
1220 | if (!arg || *arg == '\0') | 1220 | if (!arg || *arg == '\0') |
1221 | fatal("%s line %d: missing PermitOpen specification", | 1221 | fatal("%s line %d: missing PermitOpen specification", |
1222 | filename, linenum); | 1222 | filename, linenum); |
1223 | n = options->num_permitted_opens; /* modified later */ | ||
1223 | if (strcmp(arg, "any") == 0) { | 1224 | if (strcmp(arg, "any") == 0) { |
1224 | if (*activep) { | 1225 | if (*activep && n == -1) { |
1225 | channel_clear_adm_permitted_opens(); | 1226 | channel_clear_adm_permitted_opens(); |
1226 | options->num_permitted_opens = 0; | 1227 | options->num_permitted_opens = 0; |
1227 | } | 1228 | } |
1228 | break; | 1229 | break; |
1229 | } | 1230 | } |
1230 | n = options->num_permitted_opens; /* modified later */ | ||
1231 | if (*activep && n == -1) | 1231 | if (*activep && n == -1) |
1232 | channel_clear_adm_permitted_opens(); | 1232 | channel_clear_adm_permitted_opens(); |
1233 | for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) { | 1233 | for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) { |