diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-08-22 21:33:59 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-08-22 21:33:59 +0000 |
| commit | 6542dd5296c8780156ab9dd2be94e311eec492f8 (patch) | |
| tree | 519d9c40c535d72e7486399c357eddc2ce7bb14d /usr.bin/ssh/auth1.c | |
| parent | 4d8250edcf0cb3d37ee7447cb0cb8d1a91fab8f4 (diff) | |
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 'usr.bin/ssh/auth1.c')
| -rw-r--r-- | usr.bin/ssh/auth1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/auth1.c b/usr.bin/ssh/auth1.c index 4858aaebaf5..661ed5a176c 100644 --- a/usr.bin/ssh/auth1.c +++ b/usr.bin/ssh/auth1.c @@ -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" @@ -295,7 +295,8 @@ do_authloop(Authctxt *authctxt) 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(get_authname(type))) authenticated = 0; |