summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth.c9
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e2c2ba3a..e99748ece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
8 - stevesk@cvs.openbsd.org 2002/09/19 16:03:15 8 - stevesk@cvs.openbsd.org 2002/09/19 16:03:15
9 [serverloop.c] 9 [serverloop.c]
10 log IP address also; ok markus@ 10 log IP address also; ok markus@
11 - stevesk@cvs.openbsd.org 2002/09/20 18:41:29
12 [auth.c]
13 log illegal user here for missing privsep case (ssh2).
14 this is executed in the monitor. ok markus@
11 15
1220020919 1620020919
13 - (djm) OpenBSD CVS Sync 17 - (djm) OpenBSD CVS Sync
@@ -689,4 +693,4 @@
689 save auth method before monitor_reset_key_state(); bugzilla bug #284; 693 save auth method before monitor_reset_key_state(); bugzilla bug #284;
690 ok provos@ 694 ok provos@
691 695
692$Id: ChangeLog,v 1.2474 2002/09/21 15:26:27 djm Exp $ 696$Id: ChangeLog,v 1.2475 2002/09/21 15:26:51 djm Exp $
diff --git a/auth.c b/auth.c
index 43163b62e..48720da8f 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth.c,v 1.44 2002/08/08 23:54:52 stevesk Exp $"); 26RCSID("$OpenBSD: auth.c,v 1.45 2002/09/20 18:41:29 stevesk Exp $");
27 27
28#ifdef HAVE_LOGIN_H 28#ifdef HAVE_LOGIN_H
29#include <login.h> 29#include <login.h>
@@ -484,7 +484,12 @@ getpwnamallow(const char *user)
484 struct passwd *pw; 484 struct passwd *pw;
485 485
486 pw = getpwnam(user); 486 pw = getpwnam(user);
487 if (pw == NULL || !allowed_user(pw)) 487 if (pw == NULL) {
488 log("Illegal user %.100s from %.100s",
489 user, get_remote_ipaddr());
490 return (NULL);
491 }
492 if (!allowed_user(pw))
488 return (NULL); 493 return (NULL);
489#ifdef HAVE_LOGIN_CAP 494#ifdef HAVE_LOGIN_CAP
490 if ((lc = login_getclass(pw->pw_class)) == NULL) { 495 if ((lc = login_getclass(pw->pw_class)) == NULL) {