===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2.c,v
retrieving revision 1.89.2.3
retrieving revision 1.89.2.4
diff -u -r1.89.2.3 -r1.89.2.4
--- src/usr.bin/ssh/auth2.c	2002/06/26 15:30:37	1.89.2.3
+++ src/usr.bin/ssh/auth2.c	2002/10/11 14:51:52	1.89.2.4
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.89.2.3 2002/06/26 15:30:37 jason Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.89.2.4 2002/10/11 14:51:52 miod Exp $");
 
 #include "ssh2.h"
 #include "xmalloc.h"
@@ -98,7 +98,7 @@
 {
 	Authctxt *authctxt = ctxt;
 	u_int len;
-	int accept = 0;
+	int acceptit = 0;
 	char *service = packet_get_string(&len);
 	packet_check_eom();
 
@@ -107,14 +107,14 @@
 
 	if (strcmp(service, "ssh-userauth") == 0) {
 		if (!authctxt->success) {
-			accept = 1;
+			acceptit = 1;
 			/* now we can handle user-auth requests */
 			dispatch_set(SSH2_MSG_USERAUTH_REQUEST, &input_userauth_request);
 		}
 	}
 	/* XXX all other service requests are denied */
 
-	if (accept) {
+	if (acceptit) {
 		packet_start(SSH2_MSG_SERVICE_ACCEPT);
 		packet_put_cstring(service);
 		packet_send();
@@ -195,7 +195,8 @@
 		    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;