- 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

1 files changed, 3 insertions, 2 deletions

diff --git a/auth2.c b/auth2.c
index 3b47a6d0a..1cb9769ff 100644
--- a/auth2.c
+++ b/auth2.c
@@ -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;