summaryrefslogtreecommitdiff
path: root/auth2.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 /auth2.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 'auth2.c')
-rw-r--r--auth2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/auth2.c b/auth2.c
index b7492057..3cd94687 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.40 2001/02/10 12:52:02 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.41 2001/02/12 16:16:23 markus Exp $");
#include <openssl/evp.h>
@@ -230,7 +230,8 @@ input_userauth_request(int type, int plen, void *ctxt)
authctxt->user);
/* Special handling for root */
- if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed())
+ if (authenticated && authctxt->pw->pw_uid == 0 &&
+ !auth_root_allowed(method))
authenticated = 0;
#ifdef USE_PAM