summaryrefslogtreecommitdiffstats
path: root/auth1.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-02-24 11:59:26 +1100
committerDamien Miller <djm@mindrot.org>2003-02-24 11:59:26 +1100
commit556f9315a538c9575c2fcaf2a3ca4d9c068ade78 (patch)
treea048da1fb32d11a76eaa48ec381432ea9c08f733 /auth1.c
parent9e51a73122fdb06c14068017d8f2a04179bf6bf6 (diff)
- markus@cvs.openbsd.org 2003/02/06 21:22:43
[auth1.c auth2.c] undo broken fix for #387, fixes #486
Diffstat (limited to 'auth1.c')
-rw-r--r--auth1.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/auth1.c b/auth1.c
index 2ba41124..c273f2fb 100644
--- a/auth1.c
+++ b/auth1.c
@@ -10,7 +10,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.46 2003/01/23 00:03:00 djm Exp $");
+RCSID("$OpenBSD: auth1.c,v 1.47 2003/02/06 21:22:42 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -328,8 +328,7 @@ do_authloop(Authctxt *authctxt)
}
#else
/* Special handling for root */
- if (!use_privsep &&
- authenticated && authctxt->pw->pw_uid == 0 &&
+ if (authenticated && authctxt->pw->pw_uid == 0 &&
!auth_root_allowed(get_authname(type)))
authenticated = 0;
#endif