Reverted my earlier change. It was incorrect. We must be protected by

pidfile before doing secrets_init().
Jeremy.

diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c
index a937f06639eabd1abd60b2cc9a2f738229baf126..bb4a1b78ec5509aec5fa40e0468b6e6e30c064a1 100644 (file)
--- a/source/nsswitch/winbindd.c
+++ b/source/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);