From 7f981b457f9c64e6f93149051d9703ee81fd3726 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 20 Feb 2007 19:57:14 +0000
Subject: r21474: Ensure trustdom_cache_shutdown() gets called on terminate.
 Pointed out by Herb. Jeremy. (This used to be commit
 08998b74a51acd55eb6cbe095e682e2a79334736)

---
 source3/nsswitch/winbindd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/nsswitch')

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 9a6f1f3c285..ef6d4700ceb 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -121,13 +121,15 @@ static void terminate(void)
 {
 	pstring path;
 
-	idmap_close();
-	
 	/* Remove socket file */
 	pstr_sprintf(path, "%s/%s", 
 		 WINBINDD_SOCKET_DIR, WINBINDD_SOCKET_NAME);
 	unlink(path);
 
+	idmap_close();
+	
+	trustdom_cache_shutdown();
+
 #if 0
 	if (interactive) {
 		TALLOC_CTX *mem_ctx = talloc_init("end_description");
@@ -1107,7 +1109,5 @@ int main(int argc, char **argv, char **envp)
 	while (1)
 		process_loop();
 
-	trustdom_cache_shutdown();
-
 	return 0;
 }
-- 
cgit