diff options
author | Damien Miller <djm@mindrot.org> | 2009-01-28 16:33:01 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2009-01-28 16:33:01 +1100 |
commit | e37dde06a6a1ce6c2d2ce853d9834b715af82d47 (patch) | |
tree | d62365c65b91c1f548daa94803aec706af440c19 /auth-options.c | |
parent | 3dc71ad8653bab5591fc75bb1d3e6aa8fb9360df (diff) |
- djm@cvs.openbsd.org 2009/01/22 10:09:16
[auth-options.c]
another chunk of a2port() diff that got away. wtfdjm??
Diffstat (limited to 'auth-options.c')
-rw-r--r-- | auth-options.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/auth-options.c b/auth-options.c index 25361455e..ab085c233 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-options.c,v 1.43 2008/06/10 23:06:19 djm Exp $ */ | 1 | /* $OpenBSD: auth-options.c,v 1.44 2009/01/22 10:09:16 djm 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 |
@@ -255,7 +255,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
255 | cp = "permitopen=\""; | 255 | cp = "permitopen=\""; |
256 | if (strncasecmp(opts, cp, strlen(cp)) == 0) { | 256 | if (strncasecmp(opts, cp, strlen(cp)) == 0) { |
257 | char *host, *p; | 257 | char *host, *p; |
258 | u_short port; | 258 | int port; |
259 | char *patterns = xmalloc(strlen(opts) + 1); | 259 | char *patterns = xmalloc(strlen(opts) + 1); |
260 | 260 | ||
261 | opts += strlen(cp); | 261 | opts += strlen(cp); |
@@ -293,7 +293,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
293 | goto bad_option; | 293 | goto bad_option; |
294 | } | 294 | } |
295 | host = cleanhostname(host); | 295 | host = cleanhostname(host); |
296 | if (p == NULL || (port = a2port(p)) == 0) { | 296 | if (p == NULL || (port = a2port(p)) <= 0) { |
297 | debug("%.100s, line %lu: Bad permitopen port " | 297 | debug("%.100s, line %lu: Bad permitopen port " |
298 | "<%.100s>", file, linenum, p ? p : ""); | 298 | "<%.100s>", file, linenum, p ? p : ""); |
299 | auth_debug_add("%.100s, line %lu: " | 299 | auth_debug_add("%.100s, line %lu: " |