- markus@cvs.openbsd.org 2003/02/06 21:22:43

     [auth1.c auth2.c]
     undo broken fix for #387, fixes #486

diff --git a/ChangeLog b/ChangeLog
index 6f1b2cd2a926e4681f6dc453d55cf8c5108814e6..9c703531d396a36b526baeca25bf85c05a974d0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,9 @@
    - markus@cvs.openbsd.org 2003/02/06 09:29:18
      [sftp-server.c]
      fix races in rename/symlink; from Tony Finch; ok djm@
+   - markus@cvs.openbsd.org 2003/02/06 21:22:43
+     [auth1.c auth2.c]
+     undo broken fix for #387, fixes #486
 
 20030211
  - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com

diff --git a/auth1.c b/auth1.c
index 2ba411243ef859f1b63297c87ddbef754a00f48b..c273f2fb6b5f56d0b180a10c049989c46b0aaa9a 100644 (file)
--- 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

diff --git a/auth2.c b/auth2.c
index 17c58552a886b54e90dd631013ffc79a6895455d..1b21eb2dab7b25cf493996f09bdb4873a6c992bf 100644 (file)
--- 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;