diff options
| author | des <des@FreeBSD.org> | 2003-04-23 16:53:02 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-04-23 16:53:02 +0000 |
| commit | 85b37b9574631df0f7e774dda373514195c74b29 (patch) | |
| tree | 70033bf9d0551c1f485a8bf5c04d41148812e33a /crypto/openssh/auth2.c | |
| parent | 099d1a58f7bc088a9f71af6d32542ca3949468a3 (diff) | |
| download | FreeBSD-src-85b37b9574631df0f7e774dda373514195c74b29.zip FreeBSD-src-85b37b9574631df0f7e774dda373514195c74b29.tar.gz | |
Vendor import of OpenSSH-portable 3.6.1p1.
Diffstat (limited to 'crypto/openssh/auth2.c')
| -rw-r--r-- | crypto/openssh/auth2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c index 17c5855..1b21eb2 100644 --- a/crypto/openssh/auth2.c +++ b/crypto/openssh/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" @@ -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; |
