From 556f9315a538c9575c2fcaf2a3ca4d9c068ade78 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 24 Feb 2003 11:59:26 +1100 Subject: - markus@cvs.openbsd.org 2003/02/06 21:22:43 [auth1.c auth2.c] undo broken fix for #387, fixes #486 --- auth2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'auth2.c') diff --git a/auth2.c b/auth2.c index 17c58552a..1b21eb2da 100644 --- a/auth2.c +++ b/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 $"); #include "ssh2.h" #include "xmalloc.h" @@ -205,8 +205,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; -- cgit v1.2.3