diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2003-02-06 21:22:44 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2003-02-06 21:22:44 +0000 |
| commit | f65e9f3379c1369a5d4cd836f5b3978eb68afe30 (patch) | |
| tree | 4c26ba9193b8e55b8b7eed27d7352e1c2bca5311 /usr.bin/ssh | |
| parent | c9e11f588f8770cac3c1aacbee90490be1946730 (diff) | |
undo broken fix for #387, fixes #486
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/auth1.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/auth2.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/ssh/auth1.c b/usr.bin/ssh/auth1.c index 7a01eb6a76f..8d1cbf9ea8f 100644 --- a/usr.bin/ssh/auth1.c +++ b/usr.bin/ssh/auth1.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth1.c,v 1.46 2003/01/23 00:03:00 djm Exp $"); +RCSID("$OpenBSD: auth1.c,v 1.47 2003/02/06 21:22:42 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -314,8 +314,7 @@ do_authloop(Authctxt *authctxt) authctxt->user); /* Special handling for root */ - if (!use_privsep && - authenticated && authctxt->pw->pw_uid == 0 && + if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(get_authname(type))) authenticated = 0; diff --git a/usr.bin/ssh/auth2.c b/usr.bin/ssh/auth2.c index d5a504369fc..19d8b5cbf89 100644 --- a/usr.bin/ssh/auth2.c +++ b/usr.bin/ssh/auth2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.95 2002/08/22 21:33:58 markus Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.96 2003/02/06 21:22:43 markus Exp $"); #include "ssh2.h" #include "xmalloc.h" @@ -195,8 +195,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) authctxt->user); /* Special handling for root */ - if (!use_privsep && - authenticated && authctxt->pw->pw_uid == 0 && + if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(method)) authenticated = 0; |