From fb5362c069b5b6548478b2217a0519c56d856705 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 20 Feb 2006 17:59:58 +0000
Subject: r13571: Replace all calls to talloc_free() with thye TALLOC_FREE()
 macro which sets the freed pointer to NULL. (This used to be commit
 b65be8874a2efe5a4b167448960a4fcf6bd995e2)

---
 source3/nsswitch/winbindd.c            | 6 +++---
 source3/nsswitch/winbindd_cred_cache.c | 9 +++++----
 source3/nsswitch/winbindd_dual.c       | 6 +++---
 source3/nsswitch/winbindd_ldap.c       | 4 ++--
 source3/nsswitch/winbindd_pam.c        | 2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'source3/nsswitch')

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 4a269bac17..8314c65c64 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -692,7 +692,7 @@ static void remove_client(struct winbindd_cli_state *state)
 		/* Remove from list and free */
 		
 		winbindd_remove_client(state);
-		talloc_free(state);
+		TALLOC_FREE(state);
 	}
 }
 
@@ -751,8 +751,8 @@ static void process_loop(void)
 
 	/* Free up temporary memory */
 
-	lp_talloc_free();
-	main_loop_talloc_free();
+	lp_TALLOC_FREE();
+	main_loop_TALLOC_FREE();
 
 	/* Initialise fd lists for select() */
 
diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c
index a8aab04031..991718fb26 100644
--- a/source3/nsswitch/winbindd_cred_cache.c
+++ b/source3/nsswitch/winbindd_cred_cache.c
@@ -73,8 +73,9 @@ NTSTATUS remove_ccache_by_ccname(const char *ccname)
 	for (entry = ccache_list; entry; entry = entry->next) {
 		if (strequal(entry->ccname, ccname)) {
 			DLIST_REMOVE(ccache_list, entry);
-			talloc_free(entry->event); /* unregisters events */
-			return talloc_free(entry) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+			TALLOC_FREE(entry->event); /* unregisters events */
+			TALLOC_FREE(entry);
+			return NT_STATUS_OK;
 		}
 	}
 	return NT_STATUS_OBJECT_NAME_NOT_FOUND;
@@ -94,7 +95,7 @@ static void krb5_ticket_refresh_handler(struct timed_event *te,
 	DEBUG(10,("krb5_ticket_refresh_handler called\n"));
 	DEBUGADD(10,("event called for: %s, %s\n", entry->ccname, entry->username));
 
-	talloc_free(entry->event);
+	TALLOC_FREE(entry->event);
 
 #ifdef HAVE_KRB5
 
@@ -117,7 +118,7 @@ static void krb5_ticket_refresh_handler(struct timed_event *te,
 
 		if (ret) {
 			DEBUG(3,("could not re-kinit: %s\n", error_message(ret)));
-			talloc_free(entry->event);
+			TALLOC_FREE(entry->event);
 			return;
 		}
 
diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c
index 56a7afec9f..7864254c46 100644
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/nsswitch/winbindd_dual.c
@@ -509,7 +509,7 @@ static void account_lockout_policy_handler(struct timed_event *te,
 	DEBUG(10,("account_lockout_policy_handler called\n"));
 
 	if (child->timed_event) {
-		talloc_free(child->timed_event);
+		TALLOC_FREE(child->timed_event);
 	}
 
 	methods = child->domain->methods;
@@ -675,8 +675,8 @@ static BOOL fork_domain_child(struct winbindd_child *child)
 		struct timeval now;
 
 		/* free up any talloc memory */
-		lp_talloc_free();
-		main_loop_talloc_free();
+		lp_TALLOC_FREE();
+		main_loop_TALLOC_FREE();
 
 		run_events();
 
diff --git a/source3/nsswitch/winbindd_ldap.c b/source3/nsswitch/winbindd_ldap.c
index 736d852a74..cd0214ff45 100644
--- a/source3/nsswitch/winbindd_ldap.c
+++ b/source3/nsswitch/winbindd_ldap.c
@@ -445,8 +445,8 @@ static void process_ldap_loop(void)
 
 	/* Free up temporary memory */
 
-	lp_talloc_free();
-	main_loop_talloc_free();
+	lp_TALLOC_FREE();
+	main_loop_TALLOC_FREE();
 
 	if (do_sigterm) {
 #if 0
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index 47b8d7bbd5..3f0b7f07aa 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -1265,7 +1265,7 @@ done:
 				strlen(state->response.extra_data)+1;
 
 	no_token:
-		talloc_free(afsname);
+		TALLOC_FREE(afsname);
 	}
 
 	return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
-- 
cgit