Move setting of default SlurmdSpoolDir into common/read_config.c rather

than within slurmd. This means "scontrol show config" shows the proper
value rather than "NULL".

src/common/read_config.c

@@ -856,6 +856,9 @@ validate_config (slurm_ctl_conf_t *ctl_conf_ptr)
 		ctl_conf_ptr->slurm_user_name = xstrdup("root");
 		ctl_conf_ptr->slurm_user_id   = 0;
 	}
+
+	if (ctl_conf_ptr->slurmd_spooldir == NULL) 
+		ctl_conf_ptr->slurmd_spooldir = xstrdup(DEFAULT_SPOOLDIR);
 }
 
 /* Normalize supplied debug level to be in range per log.h definitions */

src/common/read_config.h

@@ -35,6 +35,7 @@
 #define DEFAULT_KILL_WAIT           30
 #define DEFAULT_SLURMCTLD_PIDFILE   "/var/run/slurmctld.pid"
 #define DEFAULT_SLURMD_PIDFILE      "/var/run/slurmd.pid"
+#define DEFAULT_SPOOLDIR            "/var/spool/slurmd"
 #define DEFAULT_WAIT_TIME           0
 
 /* 

src/slurmd/slurmd.c

@@ -70,8 +70,6 @@
 
 #define MAX_THREADS		64
 
-#define DEFAULT_SPOOLDIR	"/var/spool/slurmd"
-
 typedef struct connection {
 	slurm_fd fd;
 	slurm_addr *cli_addr;