From 3a9a5555d9a60e92205b266f1cf7a53a63ea52be Mon Sep 17 00:00:00 2001
From: "Christopher J. Morrone" <morrone2@llnl.gov>
Date: Thu, 19 Jul 2007 03:24:25 +0000
Subject: [PATCH] svn merge -r11856:11858
 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

---
 src/slurmctld/proc_req.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 396a7e3dd16..0afc470c30c 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -386,6 +386,8 @@ void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
 	conf_ptr->node_prefix         = xstrdup(conf->node_prefix);
 	conf_ptr->tree_width          = conf->tree_width;
 	conf_ptr->use_pam             = conf->use_pam;
+	conf_ptr->unkillable_program  = xstrdup(conf->unkillable_program);
+	conf_ptr->unkillable_timeout  = conf->unkillable_timeout;
 
 	slurm_conf_unlock();
 	return;
-- 
GitLab