- markus@cvs.openbsd.org 2001/02/12 16:16:23

     [auth-passwd.c auth.c auth.h auth1.c auth2.c servconf.c servconf.h
      ssh-keygen.c sshd.8]
     PermitRootLogin={yes,without-password,forced-commands-only,no}
     (before this change, root could login even if PermitRootLogin==no)

1 files changed, 3 insertions, 2 deletions

diff --git a/auth1.c b/auth1.c
index 31034262b..2649924fd 100644
--- a/auth1.c
+++ b/auth1.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.15 2001/02/07 22:35:45 markus Exp $");
+RCSID("$OpenBSD: auth1.c,v 1.16 2001/02/12 16:16:23 markus Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -316,7 +316,8 @@ do_authloop(Authctxt *authctxt)
                 }
 #else
                 /* Special handling for root */
-                if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed())
+                if (authenticated && authctxt->pw->pw_uid == 0 &&
+                    !auth_root_allowed(get_authname(type)))
                         authenticated = 0;
 #endif
 #ifdef USE_PAM