- djm@cvs.openbsd.org 2009/01/22 10:02:34

     [clientloop.c misc.c readconf.c readconf.h servconf.c servconf.h]
     [serverloop.c ssh-keyscan.c ssh.c sshd.c]
     make a2port() return -1 when it encounters an invalid port number
     rather than 0, which it will now treat as valid (needed for future work)
     adjust current consumers of a2port() to check its return value is <= 0,
     which in turn required some things to be converted from u_short => int
     make use of int vs. u_short consistent in some other places too
     feedback & ok markus@

1 files changed, 3 insertions, 3 deletions

diff --git a/readconf.c b/readconf.c
index f63a00c47..0a8be1400 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.174 2009/01/15 17:38:43 stevesk Exp $ */
+/* $OpenBSD: readconf.c,v 1.175 2009/01/22 10:02:34 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1279,11 +1279,11 @@ parse_forward(Forward *fwd, const char *fwdspec, int dynamicfwd)
         } else {
                 if (!(i == 3 || i == 4))
                         goto fail_free;
-                if (fwd->connect_port == 0)
+                if (fwd->connect_port <= 0)
                         goto fail_free;
         }
 
-        if (fwd->listen_port == 0)
+        if (fwd->listen_port <= 0)
                 goto fail_free;
 
         if (fwd->connect_host != NULL &&