--------------------- PatchSet 1946 Date: 2001/04/16 08:46:24 Author: rbcollins Branch: ntlm Tag: (none) Log: extra asserts to assist in chasing kinkie production bug Members: src/auth/ntlm/auth_ntlm.c:1.1.10.14.2.8->1.1.10.14.2.9 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.8 retrieving revision 1.1.10.14.2.9 diff -u -r1.1.10.14.2.8 -r1.1.10.14.2.9 --- squid/src/auth/ntlm/auth_ntlm.c 13 Apr 2001 10:34:50 -0000 1.1.10.14.2.8 +++ squid/src/auth/ntlm/auth_ntlm.c 16 Apr 2001 08:46:24 -0000 1.1.10.14.2.9 @@ -428,7 +428,7 @@ /* copy the challenge to the state data */ helperstate = helperStatefulServerGetData(lastserver); if (helperstate == NULL) - fatal("lost NTLm helper state! quitting\n"); + fatal("lost NTLM helper state! quitting\n"); helperstate->challenge = xstrndup(reply, NTLM_CHALLENGE_SZ + 5); helperstate->challengeuses = 0; helperstate->renewed = squid_curtime; @@ -681,6 +681,16 @@ r->data = data; r->auth_user_request = auth_user_request; snprintf(buf, 8192, "%s\n", sent_string); + +#ifdef EXTRA_DEBUG +assert (r->auth_user_request); +assert (r->auth_user_request->scheme_data); +assert (r->auth_user_request->auth_user); +assert (r->auth_user_request->auth_user->scheme_data); +#endif + + + helperStatefulSubmit(ntlmauthenticators, buf, authenticateNTLMHandleReply, r, ntlm_request->authhelper); debug(29, 9) ("authenticateNTLMstart: finished\n"); #else @@ -721,6 +731,15 @@ helperStatefulSubmit(ntlmauthenticators, NULL, authenticateNTLMHandleplaceholder, r, ntlm_request->authhelper); } else { snprintf(buf, 8192, "YR\n"); + +#ifdef EXTRA_DEBUG +assert (r->auth_user_request); +assert (r->auth_user_request->scheme_data); +assert (r->auth_user_request->auth_user); +assert (r->auth_user_request->auth_user->scheme_data); +#endif + + helperStatefulSubmit(ntlmauthenticators, buf, authenticateNTLMHandleReply, r, ntlm_request->authhelper); } } else { @@ -741,6 +760,15 @@ r->data = data; r->auth_user_request = auth_user_request; snprintf(buf, 8192, "KK %s\n", sent_string); + +#ifdef EXTRA_DEBUG +assert (r->auth_user_request); +assert (r->auth_user_request->scheme_data); +assert (r->auth_user_request->auth_user); +assert (r->auth_user_request->auth_user->scheme_data); +#endif + + helperStatefulSubmit(ntlmauthenticators, buf, authenticateNTLMHandleReply, r, ntlm_request->authhelper); debug(29, 9) ("authenticateNTLMstart: finished\n"); break;