summaryrefslogtreecommitdiffstats
path: root/source3/nsswitch
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-02-20 19:57:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:07 -0500
commit7f981b457f9c64e6f93149051d9703ee81fd3726 (patch)
tree6130196aad30745b30b2f2196d92b8905d2c2c0b /source3/nsswitch
parent415612949005edffa3ca05133ea5f1358f578161 (diff)
downloadsamba-7f981b457f9c64e6f93149051d9703ee81fd3726.tar.gz
samba-7f981b457f9c64e6f93149051d9703ee81fd3726.tar.xz
samba-7f981b457f9c64e6f93149051d9703ee81fd3726.zip
r21474: Ensure trustdom_cache_shutdown() gets called
on terminate. Pointed out by Herb. Jeremy. (This used to be commit 08998b74a51acd55eb6cbe095e682e2a79334736)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/winbindd.c8
1 files changed, 4 insertions, 4 deletions
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;
}