diff options
author | Damien Miller <djm@mindrot.org> | 2002-09-04 16:37:26 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-09-04 16:37:26 +1000 |
commit | de6f2de8ad528cd8cdfb4b4dc5de9e7ba086c957 (patch) | |
tree | b5665b1ac83d5ec745dba26cb6d000b5686d402f /auth2.c | |
parent | 061d5b144f7aaa9ce86838d437790b8e3a46050c (diff) |
- markus@cvs.openbsd.org 2002/08/22 21:33:58
[auth1.c auth2.c]
auth_root_allowed() is handled by the monitor in the privsep case,
so skip this for use_privsep, ok stevesk@, fixes bugzilla #387/325
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.94 2002/06/30 21:54:16 deraadt Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.95 2002/08/22 21:33:58 markus Exp $"); #include "ssh2.h" #include "xmalloc.h" @@ -205,7 +205,8 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) authctxt->user); /* Special handling for root */ - if (authenticated && authctxt->pw->pw_uid == 0 && + if (!use_privsep && + authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(method)) authenticated = 0; |