summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-09-17 20:53:21 +0000
committerJeremy Allison <jra@samba.org>2002-09-17 20:53:21 +0000
commitfe92e9caedbb68756f9d4fcb8ee20c2573e9c4ae (patch)
treec980b4e71121b3feb9f25cd472ed65ec3ad5b297
parentfa184ea1699fb5aebdc2eb0f3ca4e02749201729 (diff)
downloadsamba-fe92e9caedbb68756f9d4fcb8ee20c2573e9c4ae.tar.gz
samba-fe92e9caedbb68756f9d4fcb8ee20c2573e9c4ae.tar.bz2
samba-fe92e9caedbb68756f9d4fcb8ee20c2573e9c4ae.zip
Reverted my earlier change. It was incorrect. We must be protected by
pidfile before doing secrets_init(). Jeremy. (This used to be commit f8a0e6ad8b25d405ff2bcb492974d2f0bef81036)
-rw-r--r--source3/nsswitch/winbindd.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index a937f06639..bb4a1b78ec 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -853,8 +853,11 @@ static void usage(void)
fstrcpy(global_myworkgroup, lp_workgroup());
- if (!interactive)
+ if (!interactive) {
become_daemon();
+ pidfile_create("winbindd");
+ }
+
#if HAVE_SETPGID
/*
@@ -889,10 +892,6 @@ static void usage(void)
return 1;
}
- /* Only create the pidfile when we're ready to receive requests. */
- if (!interactive)
- pidfile_create("winbindd");
-
/* Loop waiting for requests */
process_loop(accept_sock);