Changeset 746 for vendor/current/source3/winbindd/winbindd.c

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/source3/winbindd/winbindd.c (modified) (5 diffs)

vendor/current/source3/winbindd/winbindd.c

@@ -66 +66 @@
 
         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);
         }
 
@@ -588 +589 @@
         state->cmd_name = "unknown request";
         state->recv_fn = NULL;
+        state->last_access = time(NULL);
 
         /* Process command */
@@ -889 +891 @@
 
 static bool client_is_idle(struct winbindd_cli_state *state) {
-  return (state->response == NULL &&
+  return (state->request == NULL &&
+          state->response == NULL &&
           !state->pwent_state && !state->grent_state);
 }
@@ -1303 +1306 @@
         }
 
+        /* 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: "
@@ -1341 +1353 @@
                 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 */