svn commit: samba r21474 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch

[jra at samba.org]

Author: jra
Date: 2007-02-20 19:57:14 +0000 (Tue, 20 Feb 2007)
New Revision: 21474

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21474

Log:
Ensure trustdom_cache_shutdown() gets called
on terminate. Pointed out by Herb.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd.c
   branches/SAMBA_3_0_25/source/nsswitch/winbindd.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd.c	2007-02-20 19:53:18 UTC (rev 21473)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.c	2007-02-20 19:57:14 UTC (rev 21474)
@@ -121,13 +121,15 @@
 {
 	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 @@
 	while (1)
 		process_loop();
 
-	trustdom_cache_shutdown();
-
 	return 0;
 }

Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd.c	2007-02-20 19:53:18 UTC (rev 21473)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd.c	2007-02-20 19:57:14 UTC (rev 21474)
@@ -121,13 +121,15 @@
 {
 	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");
@@ -1093,7 +1095,5 @@
 	while (1)
 		process_loop();
 
-	trustdom_cache_shutdown();
-
 	return 0;
 }