---------------------
PatchSet 6401 
Date: 2005/01/30 13:01:50
Author: hno
Branch: negotiate-2_5
Tag: (none) 
Log:
Additional cleanups spotted by Kinkie when porting to Squid-3.

Members: 
	src/auth/negotiate/auth_negotiate.c:1.1.2.2->1.1.2.3 
	src/auth/ntlm/auth_ntlm.c:1.18.2.14.2.4->1.18.2.14.2.5 

Index: squid/src/auth/negotiate/auth_negotiate.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/negotiate/auth_negotiate.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- squid/src/auth/negotiate/auth_negotiate.c	14 Jan 2005 00:14:57 -0000	1.1.2.2
+++ squid/src/auth/negotiate/auth_negotiate.c	30 Jan 2005 13:01:50 -0000	1.1.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_negotiate.c,v 1.1.2.2 2005/01/14 00:14:57 squidadm Exp $
+ * $Id: auth_negotiate.c,v 1.1.2.3 2005/01/30 13:01:50 hno Exp $
  *
  * DEBUG: section 29    Negotiate Authenticator
  * AUTHOR: Robert Collins
@@ -124,8 +124,8 @@
     assert(negotiateConfig == scheme->scheme_data);
     if (negotiateConfig->authenticate)
 	wordlistDestroy(&negotiateConfig->authenticate);
-    xfree(negotiateConfig);
-    negotiateConfig = NULL;
+    safe_free(negotiateConfig);
+    scheme->scheme_data = NULL;
 }
 
 static void
@@ -272,7 +272,7 @@
     switch (negotiate_request->auth_state) {
     case AUTHENTICATE_STATE_NONE:	/* no progress at all. */
 	debug(29, 1) ("authenticateNegotiateDirection: called before Negotiate Authenticate!. Report a bug to squid-dev. au %p\n", auth_user_request);
-	return 1;
+	return -2;
     case AUTHENTICATE_STATE_NEGOTIATE:	/* send to client */
 	assert(negotiate_request->server_blob);
 	return 1;
@@ -368,6 +368,7 @@
     if (!negotiate_request)
 	return;
     safe_free(negotiate_request->server_blob);
+    safe_free(negotiate_request->client_blob);
     if (negotiate_request->authserver != NULL) {
 	debug(29, 9) ("authenticateNegotiateRequestFree: releasing server '%p'\n", negotiate_request->authserver);
 	authenticateNegotiateReleaseServer(negotiate_request);
@@ -389,8 +390,7 @@
     negotiate_user_t *negotiate_user = auth_user->scheme_data;
 
     debug(29, 5) ("authenticateNegotiateFreeUser: Clearing Negotiate scheme data\n");
-    if (negotiate_user->username)
-	xfree(negotiate_user->username);
+    safe_free(negotiate_user->username);
     memPoolFree(negotiate_user_pool, negotiate_user);
     auth_user->scheme_data = NULL;
 }
Index: squid/src/auth/ntlm/auth_ntlm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/auth_ntlm.c,v
retrieving revision 1.18.2.14.2.4
retrieving revision 1.18.2.14.2.5
diff -u -r1.18.2.14.2.4 -r1.18.2.14.2.5
--- squid/src/auth/ntlm/auth_ntlm.c	14 Jan 2005 00:14:58 -0000	1.18.2.14.2.4
+++ squid/src/auth/ntlm/auth_ntlm.c	30 Jan 2005 13:01:51 -0000	1.18.2.14.2.5
@@ -123,8 +123,8 @@
     assert(ntlmConfig == scheme->scheme_data);
     if (ntlmConfig->authenticate)
 	wordlistDestroy(&ntlmConfig->authenticate);
-    xfree(ntlmConfig);
-    ntlmConfig = NULL;
+    safe_free(ntlmConfig);
+    scheme->scheme_data = NULL;
 }
 
 static void
@@ -272,7 +272,7 @@
     switch (ntlm_request->auth_state) {
     case AUTHENTICATE_STATE_NONE:	/* no progress at all. */
 	debug(29, 1) ("authenticateNTLMDirection: called before NTLM Authenticate!. Report a bug to squid-dev. au %p\n", auth_user_request);
-	return 1;
+	return -2;
     case AUTHENTICATE_STATE_NEGOTIATE:	/* send to client */
 	assert(ntlm_request->server_blob);
 	return 1;
@@ -344,6 +344,7 @@
     if (!ntlm_request)
 	return;
     safe_free(ntlm_request->server_blob);
+    safe_free(ntlm_request->client_blob);
     if (ntlm_request->authserver != NULL) {
 	debug(29, 9) ("authenticateNTLMRequestFree: releasing server '%p'\n", ntlm_request->authserver);
 	authenticateNTLMReleaseServer(ntlm_request);
@@ -365,8 +366,7 @@
     ntlm_user_t *ntlm_user = auth_user->scheme_data;
 
     debug(29, 5) ("authenticateNTLMFreeUser: Clearing NTLM scheme data\n");
-    if (ntlm_user->username)
-	xfree(ntlm_user->username);
+    safe_free(ntlm_user->username);
     memPoolFree(ntlm_user_pool, ntlm_user);
     auth_user->scheme_data = NULL;
 }