---------------------
PatchSet 2056 
Date: 2001/04/23 09:06:20
Author: rbcollins
Branch: ntlm
Tag: (none) 
Log:
more debug tests

Members: 
	src/auth/ntlm/auth_ntlm.c:1.1.10.14.2.12->1.1.10.14.2.13 

Index: squid/src/auth/ntlm/auth_ntlm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/auth_ntlm.c,v
retrieving revision 1.1.10.14.2.12
retrieving revision 1.1.10.14.2.13
diff -u -r1.1.10.14.2.12 -r1.1.10.14.2.13
--- squid/src/auth/ntlm/auth_ntlm.c	19 Apr 2001 13:02:43 -0000	1.1.10.14.2.12
+++ squid/src/auth/ntlm/auth_ntlm.c	23 Apr 2001 09:06:20 -0000	1.1.10.14.2.13
@@ -726,7 +726,7 @@
 	ntlm_request->authhelper = server;
 	/* tell the log what helper we have been given */
 	debug(29, 9) ("authenticateNTLMStart: helper '%d' assigned\n", server);
-	/* valid challenge? */
+	/* server and valid challenge? */
 	if ((server == NULL) || !authenticateNTLMValidChallenge(helperstate)) {
 	    r = cbdataAlloc(authenticateStateData);
 	    r->handler = handler;
@@ -749,7 +749,7 @@
 		helperStatefulSubmit(ntlmauthenticators, buf, authenticateNTLMHandleReply, r, ntlm_request->authhelper);
 	    }
 	} else {
-	    /* we have a valid challenge */
+	    /* (server != NULL and we have a valid challenge) */
 	    /* TODO: turn the below into a function and call from here and handlereply */
 	    /* increment the challenge uses */
 	    helperstate->challengeuses++;
@@ -953,6 +953,9 @@
 	return;
 	break;
     case AUTHENTICATE_STATE_NEGOTIATE:
+#ifdef EXTRA_DEBUG
+debug (29,1) ("setting ntlm_request %x to CHALLENGE\n", ntlm_request);
+#endif
 	ntlm_request->auth_state = AUTHENTICATE_STATE_CHALLENGE;
 	return;
 	break;