diff options
| author | Damien Miller <djm@mindrot.org> | 2009-01-28 06:31:22 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2009-01-28 06:31:22 +0100 |
| commit | 3dc71ad8653bab5591fc75bb1d3e6aa8fb9360df (patch) | |
| tree | c41a8152c222b8bebb63d9d9185e8a160b71a5a0 /serverloop.c | |
| parent | - djm@cvs.openbsd.org 2009/01/22 09:49:57 (diff) | |
| download | openssh-3dc71ad8653bab5591fc75bb1d3e6aa8fb9360df.tar.xz openssh-3dc71ad8653bab5591fc75bb1d3e6aa8fb9360df.zip | |
- 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@
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/serverloop.c b/serverloop.c index 6a3ae1665..931779e30 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.154 2008/12/02 19:08:59 markus Exp $ */ +/* $OpenBSD: serverloop.c,v 1.155 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 @@ -942,7 +942,7 @@ server_request_direct_tcpip(void) { Channel *c; char *target, *originator; - int target_port, originator_port; + u_short target_port, originator_port; target = packet_get_string(NULL); target_port = packet_get_int(); |