diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index c1a5aa0c22404824f447ad5d03ac312f61794224..e781bb5e0c709fbccc5c027f4a5162e7ea655021 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -1474,7 +1474,7 @@ done:
 	resp_msg.msg_type     = RESPONSE_REATTACH_TASKS;
 	resp_msg.forward      = msg->forward;
 	resp_msg.ret_list     = msg->ret_list;
-	resp->node_name       = conf->node_name;
+	resp->node_name       = xstrdup(conf->node_name);
 	resp->srun_node_id    = req->srun_node_id;
 	resp->return_code     = rc;
 
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 7f646533eff5a23f8cfc58aa6319199e221d5680..fbcc58cf40d0390bcf21445959c6331f2438bf71 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -627,6 +627,7 @@ _print_conf()
 	debug3("Debug       = %d",       cf->slurmd_debug);
 	debug3("Epilog      = `%s'",     conf->epilog);
 	debug3("Logfile     = `%s'",     cf->slurmd_logfile);
+	debug3("NodeName    = %s",       conf->node_name);
 	debug3("Port        = %u",       conf->port);
 	debug3("Prolog      = `%s'",     conf->prolog);
 	debug3("TmpFS       = `%s'",     conf->tmpfs);