diff options
author | Damien Miller <djm@mindrot.org> | 2003-06-04 22:50:54 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-06-04 22:50:54 +1000 |
commit | 9fc7c699af19977dbb5984374076821bf1f0fd13 (patch) | |
tree | 3818f83f74d811c976ac4a4d9de9f2fa05feb2fe | |
parent | 4c322482bbf1a7465c5ef1b1e280c09d39c8bb2e (diff) |
- djm@cvs.openbsd.org 2003/06/04 12:03:59
[serverloop.c]
remove bitrotten commet; ok markus@
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | serverloop.c | 4 |
2 files changed, 7 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | 20030603 | 1 | 20030604 |
2 | - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from | 2 | - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from |
3 | simon@sxw.org.uk (Also matches a change in OpenBSD a while ago) | 3 | simon@sxw.org.uk (Also matches a change in OpenBSD a while ago) |
4 | - (djm) Bug #577 - wrong flag in scard-opensc.c sc_private_decrypt. | 4 | - (djm) Bug #577 - wrong flag in scard-opensc.c sc_private_decrypt. |
@@ -14,6 +14,9 @@ | |||
14 | - djm@cvs.openbsd.org 2003/06/04 10:23:48 | 14 | - djm@cvs.openbsd.org 2003/06/04 10:23:48 |
15 | [sshd.c] | 15 | [sshd.c] |
16 | remove duplicated group-dropping code; ok markus@ | 16 | remove duplicated group-dropping code; ok markus@ |
17 | - djm@cvs.openbsd.org 2003/06/04 12:03:59 | ||
18 | [serverloop.c] | ||
19 | remove bitrotten commet; ok markus@ | ||
17 | - (djm) Update to fix of bug #584: lock card before return. | 20 | - (djm) Update to fix of bug #584: lock card before return. |
18 | From larsch@trustcenter.de | 21 | From larsch@trustcenter.de |
19 | 22 | ||
@@ -444,4 +447,4 @@ | |||
444 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 447 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
445 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 448 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
446 | 449 | ||
447 | $Id: ChangeLog,v 1.2776 2003/06/04 12:12:17 djm Exp $ | 450 | $Id: ChangeLog,v 1.2777 2003/06/04 12:50:54 djm Exp $ |
diff --git a/serverloop.c b/serverloop.c index 39c2a488c..90eec0855 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.108 2003/05/11 20:30:24 markus Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.109 2003/06/04 12:03:59 djm Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -977,7 +977,7 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt) | |||
977 | pw = auth_get_user(); | 977 | pw = auth_get_user(); |
978 | if (pw == NULL) | 978 | if (pw == NULL) |
979 | fatal("server_input_global_request: no user"); | 979 | fatal("server_input_global_request: no user"); |
980 | listen_address = packet_get_string(NULL); /* XXX currently ignored */ | 980 | listen_address = packet_get_string(NULL); |
981 | listen_port = (u_short)packet_get_int(); | 981 | listen_port = (u_short)packet_get_int(); |
982 | debug("server_input_global_request: tcpip-forward listen %s port %d", | 982 | debug("server_input_global_request: tcpip-forward listen %s port %d", |
983 | listen_address, listen_port); | 983 | listen_address, listen_port); |