From bb394ccd7d92931e3b8e1aec9101b9c0fdc22023 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 26 Mar 2008 21:05:52 +0000
Subject: [PATCH] Remove DEFAULT_STORAGE_PASS, it must be NULL if not set, not
""
---
src/common/read_config.c | 5 -----
src/common/read_config.h | 1 -
2 files changed, 6 deletions(-)
diff --git a/src/common/read_config.c b/src/common/read_config.c
index 6af5fad92d8..ed49d58b130 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -1610,8 +1610,6 @@ validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if(default_storage_pass)
conf->job_comp_pass =
xstrdup(default_storage_pass);
- else
- conf->job_comp_pass = xstrdup(DEFAULT_STORAGE_PASS);
}
if (!s_p_get_uint32(&conf->job_comp_port, "JobCompPort",
hashtbl)) {
@@ -1716,9 +1714,6 @@ validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if(default_storage_pass)
conf->accounting_storage_pass =
xstrdup(default_storage_pass);
- else
- conf->accounting_storage_pass =
- xstrdup(DEFAULT_STORAGE_PASS);
}
if (!s_p_get_uint32(&conf->accounting_storage_port,
"AccountingStoragePort", hashtbl)) {
diff --git a/src/common/read_config.h b/src/common/read_config.h
index d4206f1c6a3..ad4dde6beaa 100644
--- a/src/common/read_config.h
+++ b/src/common/read_config.h
@@ -102,7 +102,6 @@ extern char *default_plugstack;
#define DEFAULT_STORAGE_HOST "localhost"
#define DEFAULT_STORAGE_LOC "/var/log/slurm_jobacct.log"
#define DEFAULT_STORAGE_USER "root"
-#define DEFAULT_STORAGE_PASS ""
#define DEFAULT_STORAGE_PORT 0
#define DEFAULT_SUSPEND_RATE 60
#define DEFAULT_SUSPEND_TIME 0
--
GitLab