merge with OpenSSH 3.6.1p1

[gssapi-openssh.git] / openssh / auth1.c

diff --git a/openssh/auth1.c b/openssh/auth1.c
index 3af2b66f5649d25deae1d0d765a37bb2884c94e2..8af1991728e46c9f1000ea8feb9ff01c1f431c26 100644 (file)
--- a/openssh/auth1.c
+++ b/openssh/auth1.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.44 2002/09/26 11:38:43 markus Exp $");
+RCSID("$OpenBSD: auth1.c,v 1.47 2003/02/06 21:22:42 markus Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -282,7 +282,7 @@ do_authloop(Authctxt *authctxt)
                                                snprintf(info, sizeof(info),
                                                    " tktuser %.100s",
                                                    client_user);
- 
+
                                                /* Send response to client */
                                                packet_start(
                                                    SSH_SMSG_AUTH_KERBEROS_RESPONSE);
@@ -450,7 +450,6 @@ do_authloop(Authctxt *authctxt)
                        debug("rcvd SSH_CMSG_AUTH_TIS_RESPONSE");
                        if (options.challenge_response_authentication == 1) {
                                char *response = packet_get_string(&dlen);
-                               debug("got response '%s'", response);
                                packet_check_eom();
                                authenticated = verify_response(authctxt, response);
                                memset(response, 'r', dlen);
@@ -494,8 +493,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