diff options
author | Darren Tucker <dtucker@zip.com.au> | 2011-10-02 18:57:35 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2011-10-02 18:57:35 +1100 |
commit | 1338b9e067055259033a05e14db0bc2ad5536482 (patch) | |
tree | 1aa3cda3c8b3136f8aabb0e329006fc6da3f49a7 /auth-options.c | |
parent | b0b29cc0c5befffd9902a8e6e634c4473c8687a1 (diff) |
- 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 'auth-options.c')
-rw-r--r-- | auth-options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auth-options.c b/auth-options.c index eae45cf2b..b3c19c1c0 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-options.c,v 1.54 2010/12/24 21:41:48 djm Exp $ */ | 1 | /* $OpenBSD: auth-options.c,v 1.55 2011/09/23 00:22:04 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -341,7 +341,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
341 | goto bad_option; | 341 | goto bad_option; |
342 | } | 342 | } |
343 | host = cleanhostname(host); | 343 | host = cleanhostname(host); |
344 | if (p == NULL || (port = a2port(p)) <= 0) { | 344 | if (p == NULL || (port = permitopen_port(p)) < 0) { |
345 | debug("%.100s, line %lu: Bad permitopen port " | 345 | debug("%.100s, line %lu: Bad permitopen port " |
346 | "<%.100s>", file, linenum, p ? p : ""); | 346 | "<%.100s>", file, linenum, p ? p : ""); |
347 | auth_debug_add("%.100s, line %lu: " | 347 | auth_debug_add("%.100s, line %lu: " |