Changeset 736 for branches/samba-3.5.x/source3/winbindd/winbindd.c

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

File:

• branches/samba-3.5.x/source3/winbindd/winbindd.c (modified) (3 diffs)

branches/samba-3.5.x/source3/winbindd/winbindd.c

@@ -68 +68 @@
 
         if (lp_loaded()) {
-                const char *fname = lp_configfile();
+                char *fname = lp_configfile();
 
                 if (file_exist(fname) && !strcsequal(fname,get_dyn_CONFIGFILE())) {
                         set_dyn_CONFIGFILE(fname);
                 }
+                TALLOC_FREE(fname);
         }
 
@@ -1073 +1074 @@
         }
 
+        /* We call dump_core_setup one more time because the command line can
+         * set the log file or the log-basename and this will influence where
+         * cores are stored. Without this call get_dyn_LOGFILEBASE will be
+         * the default value derived from build's prefix. For EOM this value
+         * is often not related to the path where winbindd is actually run
+         * in production.
+         */
+        dump_core_setup("winbindd");
+
         if (is_daemon && interactive) {
                 d_fprintf(stderr,"\nERROR: "
@@ -1107 +1117 @@
                 exit(1);
         }
+        /* After parsing the configuration file we setup the core path one more time
+         * as the log file might have been set in the configuration and cores's
+         * path is by default basename(lp_logfile()).
+         */
+        dump_core_setup("winbindd");
 
         /* Initialise messaging system */