diff options
author | Darren Tucker <dtucker@zip.com.au> | 2011-10-02 09:57:35 +0200 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2011-10-02 09:57:35 +0200 |
commit | 1338b9e067055259033a05e14db0bc2ad5536482 (patch) | |
tree | 1aa3cda3c8b3136f8aabb0e329006fc6da3f49a7 /servconf.c | |
parent | remove SELECT_REQUIRED_FDS added erroneously with strnlen. spotted by tim (diff) | |
download | openssh-1338b9e067055259033a05e14db0bc2ad5536482.tar.xz openssh-1338b9e067055259033a05e14db0bc2ad5536482.zip |
- dtucker@cvs.openbsd.org 2011/09/23 00:22:04
[channels.c auth-options.c servconf.c channels.h sshd.8]
Add wildcard support to PermitOpen, allowing things like "PermitOpen
localhost:*". bz #1857, ok djm markus.
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index 91986e55d..8ec5ca0e6 100644 --- a/servconf.c +++ b/servconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.222 2011/06/22 21:57:01 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.223 2011/09/23 00:22:04 dtucker Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1341,7 +1341,7 @@ process_server_config_line(ServerOptions *options, char *line, fatal("%s line %d: missing host in PermitOpen", filename, linenum); p = cleanhostname(p); - if (arg == NULL || (port = a2port(arg)) <= 0) + if (arg == NULL || ((port = permitopen_port(arg)) < 0)) fatal("%s line %d: bad port number in " "PermitOpen", filename, linenum); if (*activep && n == -1) |