diff options
author | Damien Miller <djm@mindrot.org> | 2003-11-17 21:13:40 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-11-17 21:13:40 +1100 |
commit | 3e3b5145e59c78cbde0f31f59a9267867b8eea2f (patch) | |
tree | 6725a1cc2cd54237952d89e4811e1cb82cc46a5d /serverloop.c | |
parent | 8f746ec9703a0072c7a07a25e4c059f7533bf94b (diff) |
- djm@cvs.openbsd.org 2003/11/04 08:54:09
[auth1.c auth2.c auth2-pubkey.c auth.h auth-krb5.c auth-passwd.c]
[auth-rhosts.c auth-rh-rsa.c auth-rsa.c monitor.c serverloop.c]
[session.c]
standardise arguments to auth methods - they should all take authctxt.
check authctxt->valid rather then pw != NULL; ok markus@
Diffstat (limited to 'serverloop.c')
-rw-r--r-- | serverloop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c index 21656cf87..98793b756 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.111 2003/09/23 20:17:11 markus Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.112 2003/11/04 08:54:09 djm Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -973,8 +973,8 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt) | |||
973 | u_short listen_port; | 973 | u_short listen_port; |
974 | 974 | ||
975 | pw = the_authctxt->pw; | 975 | pw = the_authctxt->pw; |
976 | if (pw == NULL) | 976 | if (pw == NULL || !the_authctxt->pw) |
977 | fatal("server_input_global_request: no user"); | 977 | fatal("server_input_global_request: no/invalid user"); |
978 | listen_address = packet_get_string(NULL); | 978 | listen_address = packet_get_string(NULL); |
979 | listen_port = (u_short)packet_get_int(); | 979 | listen_port = (u_short)packet_get_int(); |
980 | debug("server_input_global_request: tcpip-forward listen %s port %d", | 980 | debug("server_input_global_request: tcpip-forward listen %s port %d", |