summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-17 21:13:40 +1100
committerDamien Miller <djm@mindrot.org>2003-11-17 21:13:40 +1100
commit3e3b5145e59c78cbde0f31f59a9267867b8eea2f (patch)
tree6725a1cc2cd54237952d89e4811e1cb82cc46a5d /serverloop.c
parent8f746ec9703a0072c7a07a25e4c059f7533bf94b (diff)
downloadopenssh-git-3e3b5145e59c78cbde0f31f59a9267867b8eea2f.tar.gz
- 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c
index 21656cf8..98793b75 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.111 2003/09/23 20:17:11 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.112 2003/11/04 08:54:09 djm Exp $");
#include "xmalloc.h"
#include "packet.h"
@@ -973,8 +973,8 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt)
u_short listen_port;
pw = the_authctxt->pw;
- if (pw == NULL)
- fatal("server_input_global_request: no user");
+ if (pw == NULL || !the_authctxt->pw)
+ fatal("server_input_global_request: no/invalid user");
listen_address = packet_get_string(NULL);
listen_port = (u_short)packet_get_int();
debug("server_input_global_request: tcpip-forward listen %s port %d",