diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2009-01-22 10:02:35 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2009-01-22 10:02:35 +0000 |
| commit | 0435102032a11e65c85556d97788aaa493e961c5 (patch) | |
| tree | 427ca5c5b89340e1a6b64f29a1cdd06d754864f6 /usr.bin/ssh/readconf.h | |
| parent | a0c3482df2bba2a7b24e534b155079910aed219d (diff) | |
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@
Diffstat (limited to 'usr.bin/ssh/readconf.h')
| -rw-r--r-- | usr.bin/ssh/readconf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/readconf.h b/usr.bin/ssh/readconf.h index c9e5f6a411c..d94d65890d2 100644 --- a/usr.bin/ssh/readconf.h +++ b/usr.bin/ssh/readconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.h,v 1.76 2008/11/04 08:22:13 djm Exp $ */ +/* $OpenBSD: readconf.h,v 1.77 2009/01/22 10:02:34 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -20,9 +20,9 @@ typedef struct { char *listen_host; /* Host (address) to listen on. */ - u_short listen_port; /* Port to forward. */ + int listen_port; /* Port to forward. */ char *connect_host; /* Host to connect. */ - u_short connect_port; /* Port to connect on connect_host. */ + int connect_port; /* Port to connect on connect_host. */ } Forward; /* Data structure for representing option data. */ |