Changeset 158 for branches/samba-3.0/source/nsswitch/winbindd.c

Timestamp:

Sep 30, 2008, 7:14:08 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.32

File:

• branches/samba-3.0/source/nsswitch/winbindd.c (modified) (7 diffs)

branches/samba-3.0/source/nsswitch/winbindd.c

@@ -47 +47 @@
 /* Reload configuration */
 
-static BOOL reload_services_file(void)
+static BOOL reload_services_file(const char *logfile)
 {
         BOOL ret;
@@ -62 +62 @@
         reopen_logs();
         ret = lp_load(dyn_CONFIGFILE,False,False,True,True);
+
+        /* if this is a child, restore the logfile to the special
+           name - <domain>, idmap, etc. */
+        if (logfile && *logfile)
+                lp_set_logfile(logfile);
 
         reopen_logs();
@@ -189 +194 @@
         /* Flush various caches */
         flush_caches();
-        reload_services_file();
+        reload_services_file((const char *) private_data);
 }
 
@@ -727 +732 @@
 
 /* check if HUP has been received and reload files */
-void winbind_check_sighup(void)
+void winbind_check_sighup(const char *logfile)
 {
         if (do_sighup) {
@@ -733 +738 @@
                 DEBUG(3, ("got SIGHUP\n"));
 
-                msg_reload_services(MSG_SMB_CONF_UPDATED, pid_to_procid(0), NULL, 0, NULL);
+                msg_reload_services(MSG_SMB_CONF_UPDATED, pid_to_procid(0), NULL, 0, logfile);
                 do_sighup = False;
         }
@@ -910 +915 @@
 
         winbind_check_sigterm(true);
-        winbind_check_sighup();
+        winbind_check_sighup(NULL);
 
         if (do_sigusr2) {
@@ -1008 +1013 @@
                   COPYRIGHT_STARTUP_MESSAGE) );
 
-        if (!reload_services_file()) {
+        if (!reload_services_file(NULL)) {
                 DEBUG(0, ("error opening config file\n"));
                 exit(1);