Changeset 141 for trunk/samba/source/winbindd/winbindd.c

Timestamp:

Aug 7, 2008, 11:49:04 AM (17 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.1

File:

• trunk/samba/source/winbindd/winbindd.c (modified) (8 diffs)

trunk/samba/source/winbindd/winbindd.c

@@ -57 +57 @@
 /* Reload configuration */
 
-static bool reload_services_file(void)
+static bool reload_services_file(const char *logfile)
 {
         bool ret;
@@ -67 +67 @@
                         set_dyn_CONFIGFILE(fname);
                 }
+        }
+
+        /* if this is a child, restore the logfile to the special
+           name - <domain>, idmap, etc. */
+        if (logfile && *logfile) {
+                lp_set_logfile(logfile);
         }
 
@@ -206 +212 @@
         /* Flush various caches */
         flush_caches();
-        reload_services_file();
+        reload_services_file((const char *) private_data);
 }
 
@@ -802 +808 @@
 
 /* check if HUP has been received and reload files */
-void winbind_check_sighup(void)
+void winbind_check_sighup(const char *logfile)
 {
         if (do_sighup) {
@@ -809 +815 @@
 
                 flush_caches();
-                reload_services_file();
+                reload_services_file(logfile);
 
                 do_sighup = False;
@@ -982 +988 @@
 
         winbind_check_sigterm(true);
-        winbind_check_sighup();
+        winbind_check_sighup(NULL);
 
         if (do_sigusr2) {
@@ -1135 +1141 @@
         db_tdb2_setup_messaging(winbind_messaging_context(), true);
 
-        if (!reload_services_file()) {
+        if (!reload_services_file(NULL)) {
                 DEBUG(0, ("error opening config file\n"));
                 exit(1);
@@ -1248 +1254 @@
                            winbind_msg_dump_domain_list);
 
+        /* Register handler for MSG_DEBUG. */
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_DEBUG,
+                           winbind_msg_debug);
+        
         netsamlogon_cache_init(); /* Non-critical */