summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-02-20 19:57:14 +0000
committerJeremy Allison <jra@samba.org>2007-02-20 19:57:14 +0000
commit41ce2410e747b764cef3764717e94cae1c130a09 (patch)
treea613c0cfdd4150ffd26996ce3e65a94fef75bc40
parent74eb8bc7d1d7cd01949e2a2089264e3f36a2bc27 (diff)
downloadsamba-41ce2410e747b764cef3764717e94cae1c130a09.tar.gz
samba-41ce2410e747b764cef3764717e94cae1c130a09.tar.xz
samba-41ce2410e747b764cef3764717e94cae1c130a09.zip
r21474: Ensure trustdom_cache_shutdown() gets called
on terminate. Pointed out by Herb. Jeremy.
-rw-r--r--source/nsswitch/winbindd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c
index 341fa00c923..b4570f2525a 100644
--- a/source/nsswitch/winbindd.c
+++ b/source/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");
@@ -1093,7 +1095,5 @@ int main(int argc, char **argv, char **envp)
while (1)
process_loop();
- trustdom_cache_shutdown();
-
return 0;
}