diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-15 03:08:27 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-15 03:08:27 +0000 |
commit | d8a9021f3652d8ab99d0fed2460420c3eb4e10a2 (patch) | |
tree | a736e9a286d99325d80815c85f3353c1fa347d82 /auth-passwd.c | |
parent | 06b33aa0e83163f3dcd679317afec1ee95910512 (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 'auth-passwd.c')
-rw-r--r-- | auth-passwd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auth-passwd.c b/auth-passwd.c index 9f763267f..c849abdcc 100644 --- a/auth-passwd.c +++ b/auth-passwd.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: auth-passwd.c,v 1.20 2001/01/21 19:05:42 markus Exp $"); | 39 | RCSID("$OpenBSD: auth-passwd.c,v 1.21 2001/02/12 16:16:23 markus Exp $"); |
40 | 40 | ||
41 | #if !defined(USE_PAM) && !defined(HAVE_OSF_SIA) | 41 | #if !defined(USE_PAM) && !defined(HAVE_OSF_SIA) |
42 | 42 | ||
@@ -110,7 +110,7 @@ auth_password(struct passwd * pw, const char *password) | |||
110 | if (pw == NULL) | 110 | if (pw == NULL) |
111 | return 0; | 111 | return 0; |
112 | #ifndef HAVE_CYGWIN | 112 | #ifndef HAVE_CYGWIN |
113 | if (pw->pw_uid == 0 && options.permit_root_login == 2) | 113 | if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) |
114 | return 0; | 114 | return 0; |
115 | #endif | 115 | #endif |
116 | #ifdef HAVE_CYGWIN | 116 | #ifdef HAVE_CYGWIN |