1 files changed, 10 insertions, 10 deletions

diff --git a/servconf.c b/servconf.c
index 7d8851860..e7fc2a781 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.193 2008/12/09 03:20:42 stevesk Exp $ */
+/* $OpenBSD: servconf.c,v 1.194 2009/01/22 10:02:34 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -42,8 +42,8 @@
 #include "channels.h"
 #include "groupaccess.h"
 
-static void add_listen_addr(ServerOptions *, char *, u_short);
-static void add_one_listen_addr(ServerOptions *, char *, u_short);
+static void add_listen_addr(ServerOptions *, char *, int);
+static void add_one_listen_addr(ServerOptions *, char *, int);
 
 /* Use of privilege separation or not */
 extern int use_privsep;
@@ -460,7 +460,7 @@ parse_token(const char *cp, const char *filename,
 }
 
 static void
-add_listen_addr(ServerOptions *options, char *addr, u_short port)
+add_listen_addr(ServerOptions *options, char *addr, int port)
 {
         u_int i;
 
@@ -476,7 +476,7 @@ add_listen_addr(ServerOptions *options, char *addr, u_short port)
 }
 
 static void
-add_one_listen_addr(ServerOptions *options, char *addr, u_short port)
+add_one_listen_addr(ServerOptions *options, char *addr, int port)
 {
         struct addrinfo hints, *ai, *aitop;
         char strport[NI_MAXSERV];
@@ -486,7 +486,7 @@ add_one_listen_addr(ServerOptions *options, char *addr, u_short port)
         hints.ai_family = options->address_family;
         hints.ai_socktype = SOCK_STREAM;
         hints.ai_flags = (addr == NULL) ? AI_PASSIVE : 0;
-        snprintf(strport, sizeof strport, "%u", port);
+        snprintf(strport, sizeof strport, "%d", port);
         if ((gaierr = getaddrinfo(addr, strport, &hints, &aitop)) != 0)
                 fatal("bad addr or host: %s (%s)",
                     addr ? addr : "<NULL>",
@@ -642,7 +642,7 @@ process_server_config_line(ServerOptions *options, char *line,
         SyslogFacility *log_facility_ptr;
         LogLevel *log_level_ptr;
         ServerOpCodes opcode;
-        u_short port;
+        int port;
         u_int i, flags = 0;
         size_t len;
 
@@ -699,7 +699,7 @@ process_server_config_line(ServerOptions *options, char *line,
                         fatal("%s line %d: missing port number.",
                             filename, linenum);
                 options->ports[options->num_ports++] = a2port(arg);
-                if (options->ports[options->num_ports-1] == 0)
+                if (options->ports[options->num_ports-1] <= 0)
                         fatal("%s line %d: Badly formatted port number.",
                             filename, linenum);
                 break;
@@ -752,7 +752,7 @@ process_server_config_line(ServerOptions *options, char *line,
                 p = cleanhostname(p);
                 if (arg == NULL)
                         port = 0;
-                else if ((port = a2port(arg)) == 0)
+                else if ((port = a2port(arg)) <= 0)
                         fatal("%s line %d: bad port number", filename, linenum);
 
                 add_listen_addr(options, p, port);
@@ -1265,7 +1265,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 = a2port(arg)) <= 0)
                                 fatal("%s line %d: bad port number in "
                                     "PermitOpen", filename, linenum);
                         if (*activep && n == -1)