- 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 7db7cf5..206e725 100644
--- 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
@@ -1151,4 +1154,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2607 2003/02/24 00:58:44 djm Exp $
+$Id: ChangeLog,v 1.2608 2003/02/24 00:59:26 djm Exp $
diff --git a/auth1.c b/auth1.c
index 2ba4112..c273f2f 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 @@
}
#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 17c5855..1b21eb2 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 @@
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;