File pacemaker#3292-0004-Low-scheduler-restore-nvpai... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker#3292-0004-Low-scheduler-restore-nvpair-behavior-without-id-ref.patch of Package pacemaker (Revision 3ab9eb55c57d5ec257dc86c3fa3851c8)

Currently displaying revision 3ab9eb55c57d5ec257dc86c3fa3851c8 , Show latest

From 4d0685e2b789002bdd3090c52e76e45b0c7eb504 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Thu, 14 Dec 2023 14:16:32 -0600
Subject: [PATCH] Low: scheduler: restore nvpair behavior without id-ref

... per review
---
 lib/pengine/rules.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/pengine/rules.c b/lib/pengine/rules.c
index 88381eee0..89c487218 100644
--- a/lib/pengine/rules.c
+++ b/lib/pengine/rules.c
@@ -373,17 +373,13 @@ populate_hash(xmlNode * nvpair_list, GHashTable * hash, gboolean overwrite, xmlN
         if (pcmk__str_eq((const char *)an_attr->name, XML_CIB_TAG_NVPAIR, pcmk__str_none)) {
             xmlNode *ref_nvpair = expand_idref(an_attr, top);
 
-            if (ref_nvpair == NULL) {
-                continue; // Not possible with schema validation enabled
-            }
-
             name = crm_element_value(an_attr, XML_NVPAIR_ATTR_NAME);
-            if (name == NULL) {
+            if ((name == NULL) && (ref_nvpair != NULL)) {
                 name = crm_element_value(ref_nvpair, XML_NVPAIR_ATTR_NAME);
             }
 
             value = crm_element_value(an_attr, XML_NVPAIR_ATTR_VALUE);
-            if (value == NULL) {
+            if ((value == NULL) && (ref_nvpair != NULL)) {
                 value = crm_element_value(ref_nvpair, XML_NVPAIR_ATTR_VALUE);
             }
 
-- 
2.35.3

Places

File pacemaker#3292-0004-Low-scheduler-restore-nvpair-behavior-without-id-ref.patch of Package pacemaker (Revision 3ab9eb55c57d5ec257dc86c3fa3851c8)

Places