diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
| commit | e73e9afa91f5b9a483863ad8e01f6843c8e11fcb (patch) | |
| tree | fbb17bcf9ee0d969274a32106e1f15ae9a690fa3 /crypto/openssh/auth2.c | |
| parent | 486cd0043eb7251b30e30aa620eb213fb48b4c22 (diff) | |
| download | src-e73e9afa91f5b9a483863ad8e01f6843c8e11fcb.tar.gz src-e73e9afa91f5b9a483863ad8e01f6843c8e11fcb.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=113911
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 852c6167c9f9..9cbe376ad61f 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 $"); RCSID("$FreeBSD$"); #include "canohost.h" @@ -235,8 +235,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; |