diff options
| author | Damien Miller <djm@mindrot.org> | 2003-02-24 11:59:26 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2003-02-24 11:59:26 +1100 |
| commit | 556f9315a538c9575c2fcaf2a3ca4d9c068ade78 (patch) | |
| tree | a048da1fb32d11a76eaa48ec381432ea9c08f733 /auth2.c | |
| parent | 9e51a73122fdb06c14068017d8f2a04179bf6bf6 (diff) | |
| download | openssh-git-556f9315a538c9575c2fcaf2a3ca4d9c068ade78.tar.gz | |
- markus@cvs.openbsd.org 2003/02/06 21:22:43
[auth1.c auth2.c]
undo broken fix for #387, fixes #486
Diffstat (limited to 'auth2.c')
| -rw-r--r-- | auth2.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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" @@ -205,8 +205,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; |