From 8245a30722782100d849e1aef177cf252e4ab25a Mon Sep 17 00:00:00 2001 From: Morris Jette <jette@schedmd.com> Date: Mon, 25 Jul 2011 16:31:07 -0700 Subject: [PATCH] Fix bug in node info parsing with multiple DEFAULT values This fixes a bug in parsing slurm.conf for node information if there are more than one NodeName=DEFAULT value. This adds to existing default values rather than clearing old default values that are not explicitly set to new values on that configuration line. --- src/common/read_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/read_config.c b/src/common/read_config.c index 0a616a54fb9..03a60541af2 100644 --- a/src/common/read_config.c +++ b/src/common/read_config.c @@ -531,7 +531,7 @@ static int _parse_nodename(void **dest, slurm_parser_enum_t type, } if (default_nodename_tbl != NULL) { - s_p_hashtbl_merge(tbl, default_frontend_tbl); + s_p_hashtbl_merge(tbl, default_nodename_tbl); s_p_hashtbl_destroy(default_nodename_tbl); } default_nodename_tbl = tbl; -- GitLab