summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2009-01-22 10:09:17 +0000
committerDamien Miller <djm@cvs.openbsd.org>2009-01-22 10:09:17 +0000
commit1c665db9f80d6419c566878976837de00e9fa752 (patch)
treecbd7db0ba38001c63b6a440927c30fa3e8a88d32
parent0435102032a11e65c85556d97788aaa493e961c5 (diff)
another chunk of a2port() diff that got away. wtfdjm??
-rw-r--r--usr.bin/ssh/auth-options.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/auth-options.c b/usr.bin/ssh/auth-options.c
index ccfcc9298b4..941c6be9f01 100644
--- a/usr.bin/ssh/auth-options.c
+++ b/usr.bin/ssh/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.43 2008/06/10 23:06:19 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.44 2009/01/22 10:09:16 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -253,7 +253,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
cp = "permitopen=\"";
if (strncasecmp(opts, cp, strlen(cp)) == 0) {
char *host, *p;
- u_short port;
+ int port;
char *patterns = xmalloc(strlen(opts) + 1);
opts += strlen(cp);
@@ -291,7 +291,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
goto bad_option;
}
host = cleanhostname(host);
- if (p == NULL || (port = a2port(p)) == 0) {
+ if (p == NULL || (port = a2port(p)) <= 0) {
debug("%.100s, line %lu: Bad permitopen port "
"<%.100s>", file, linenum, p ? p : "");
auth_debug_add("%.100s, line %lu: "