From 213663f8194e55af28538a550d655691b6deea6d Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Mar 09 2021 06:18:37 +0000 Subject: Low: scheduler: use same default private parameter list as controller If the controller doesn't find any parameters marked private in resource agent meta-data, it uses "password", "passwd", and "user" as the default list (in metadata_cache_update()). If the scheduler came across a resource operation history entry with no op-secure-params list, it previously used " passwd password " as the default. Even though these are two different situations, and the scheduler should only find that situation in old saved CIBs, use the same default list for consistency. --- diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c index fd238df..a80dab3 100644 --- a/lib/pengine/utils.c +++ b/lib/pengine/utils.c @@ -2066,9 +2066,9 @@ rsc_action_digest(pe_resource_t *rsc, const char *task, const char *key, const char *ra_version = NULL; #endif - const char *op_version; + const char *op_version = NULL; const char *restart_list = NULL; - const char *secure_list = " passwd password "; + const char *secure_list = NULL; data = calloc(1, sizeof(op_digest_cache_t)); CRM_ASSERT(data != NULL); @@ -2102,6 +2102,7 @@ rsc_action_digest(pe_resource_t *rsc, const char *task, const char *key, #endif } else { + secure_list = " passwd password user "; op_version = CRM_FEATURE_SET; }