diff options
| author | djm <djm> | 2002-09-04 06:37:26 +0000 |
|---|---|---|
| committer | djm <djm> | 2002-09-04 06:37:26 +0000 |
| commit | 0a99abf8bb2812a66c9eec72faec81882f9724a7 (patch) | |
| tree | 9643f650d4aaa9af66f44796dde0c2e8d172fc61 /auth1.c | |
| parent | 4fb32e2ffef2dd529df52bedabda681ae1ca7769 (diff) | |
| download | openssh-0a99abf8bb2812a66c9eec72faec81882f9724a7.tar.gz | |
- 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 'auth1.c')
| -rw-r--r-- | auth1.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth1.c,v 1.41 2002/06/19 00:27:55 deraadt Exp $"); +RCSID("$OpenBSD: auth1.c,v 1.42 2002/08/22 21:33:58 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -301,7 +301,8 @@ do_authloop(Authctxt *authctxt) } #else /* Special handling for root */ - if (authenticated && authctxt->pw->pw_uid == 0 && + if (!use_privsep && + authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(get_authname(type))) authenticated = 0; #endif |