summaryrefslogtreecommitdiff
path: root/auth1.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-02-15 03:08:27 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-02-15 03:08:27 +0000
commitd8a9021f3652d8ab99d0fed2460420c3eb4e10a2 (patch)
treea736e9a286d99325d80815c85f3353c1fa347d82 /auth1.c
parent06b33aa0e83163f3dcd679317afec1ee95910512 (diff)
- 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)
Diffstat (limited to 'auth1.c')
-rw-r--r--auth1.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/auth1.c b/auth1.c
index 31034262..2649924f 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