diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c index 08a6e53206de68912a4d840188cdb55cf791a327..1f05fbbb1e3d322a2915a393afca4e7904fd29a8 100644 --- a/src/common/slurm_protocol_pack.c +++ b/src/common/slurm_protocol_pack.c @@ -1249,7 +1249,6 @@ void pack_slurm_ctl_conf ( slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer ) packstr (build_ptr->prioritize, buffer); packstr (build_ptr->prolog, buffer); pack16 (build_ptr->ret2service, buffer); -error("logfile=%s",build_ptr->slurmctld_logfile); packstr (build_ptr->slurmctld_logfile, buffer); pack16 (build_ptr->slurmctld_timeout, buffer); packstr (build_ptr->slurmd_logfile, buffer); @@ -1288,7 +1287,6 @@ int unpack_slurm_ctl_conf ( slurm_ctl_conf_info_msg_t **build_buffer_ptr, Buf bu safe_unpackstr_xmalloc (&build_ptr->prolog, &uint16_tmp, buffer); safe_unpack16 (&build_ptr->ret2service, buffer); safe_unpackstr_xmalloc (&build_ptr->slurmctld_logfile, &uint16_tmp, buffer); -error("logfile=%s",build_ptr->slurmctld_logfile); safe_unpack16 (&build_ptr->slurmctld_timeout, buffer); safe_unpackstr_xmalloc (&build_ptr->slurmd_logfile, &uint16_tmp, buffer); safe_unpackstr_xmalloc (&build_ptr->slurmd_spooldir, &uint16_tmp, buffer); diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c index cf922438c60c5c1337b300628684b85908daf251..34667e2e936c5b126a2c1679f378d464ee950d43 100644 --- a/src/slurmctld/controller.c +++ b/src/slurmctld/controller.c @@ -1861,7 +1861,7 @@ init_ctld_conf ( slurm_ctl_conf_t * conf_ptr ) conf_ptr->prioritize = NULL ; conf_ptr->prolog = NULL ; conf_ptr->ret2service = 0 ; - conf_ptr->slurmctld_logfile = xstrdup ("test") ; /* FIXME to NULL */ + conf_ptr->slurmctld_logfile = NULL ; conf_ptr->slurmctld_timeout = 300 ; conf_ptr->slurmd_logfile = NULL ; conf_ptr->slurmd_spooldir = NULL ;