diff options
| author | Damien Miller <djm@mindrot.org> | 2007-01-05 06:29:02 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2007-01-05 06:29:02 +0100 |
| commit | 9fc6a56204d6a1245e79346ed5e714f70c6dc9cc (patch) | |
| tree | c7e664ce27c6d0a292b7e8169ffa89e70e42609c /servconf.c | |
| parent | - dtucker@cvs.openbsd.org 2006/12/13 08:34:39 (diff) | |
| download | openssh-9fc6a56204d6a1245e79346ed5e714f70c6dc9cc.tar.xz openssh-9fc6a56204d6a1245e79346ed5e714f70c6dc9cc.zip | |
- dtucker@cvs.openbsd.org 2006/12/14 10:01:14
[servconf.c]
Make "PermitOpen all" first-match within a block to match the way other
options work. ok markus@ djm@
Diffstat (limited to '')
| -rw-r--r-- | servconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c index 83b634976..872ff4a87 100644 --- a/servconf.c +++ b/servconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.166 2006/12/13 08:34:39 dtucker Exp $ */ +/* $OpenBSD: servconf.c,v 1.167 2006/12/14 10:01:14 dtucker Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1220,14 +1220,14 @@ parse_flag: if (!arg || *arg == '\0') fatal("%s line %d: missing PermitOpen specification", filename, linenum); + n = options->num_permitted_opens; /* modified later */ if (strcmp(arg, "any") == 0) { - if (*activep) { + if (*activep && n == -1) { channel_clear_adm_permitted_opens(); options->num_permitted_opens = 0; } break; } - n = options->num_permitted_opens; /* modified later */ if (*activep && n == -1) channel_clear_adm_permitted_opens(); for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) { |