ClusterLabs · nrwahl2 · Dec 29, 2025 · Dec 29, 2025 · Dec 29, 2025 · Dec 29, 2025
diff --git a/daemons/controld/controld_join_dc.c b/daemons/controld/controld_join_dc.c
@@ -962,11 +962,9 @@ finalize_join_for(void *key, void *value, void *user_data)
                 }
 
                 remote = pcmk__xe_create(remotes, PCMK_XE_NODE);
-                pcmk__xe_set_props(remote,
-                                   PCMK_XA_ID, node->name,
-                                   PCMK__XA_NODE_STATE, node->state,
-                                   PCMK__XA_CONNECTION_HOST, node->conn_host,
-                                   NULL);
+                pcmk__xe_set(remote, PCMK_XA_ID, node->name);
+                pcmk__xe_set(remote, PCMK__XA_NODE_STATE, node->state);
+                pcmk__xe_set(remote, PCMK__XA_CONNECTION_HOST, node->conn_host);
             }
         }
     }

diff --git a/daemons/pacemakerd/pacemakerd.c b/daemons/pacemakerd/pacemakerd.c
@@ -67,12 +67,12 @@ PCMK__OUTPUT_ARGS("features")
 static int
 pacemakerd_features_xml(pcmk__output_t *out, va_list args) {
     gchar **feature_list = g_strsplit(CRM_FEATURES, " ", 0);
+    xmlNode *xml = pcmk__output_xml_create_parent(out, PCMK_XE_PACEMAKERD);
+
+    pcmk__xe_set(xml, PCMK_XA_VERSION, PACEMAKER_VERSION);
+    pcmk__xe_set(xml, PCMK_XA_BUILD, BUILD_VERSION);
+    pcmk__xe_set(xml, PCMK_XA_FEATURE_SET, CRM_FEATURE_SET);
 
-    pcmk__output_xml_create_parent(out, PCMK_XE_PACEMAKERD,
-                                   PCMK_XA_VERSION, PACEMAKER_VERSION,
-                                   PCMK_XA_BUILD, BUILD_VERSION,
-                                   PCMK_XA_FEATURE_SET, CRM_FEATURE_SET,
-                                   NULL);
     out->begin_list(out, NULL, NULL, PCMK_XE_FEATURES);
 
     for (char **s = feature_list; *s != NULL; s++) {

diff --git a/include/crm/common/acl.h b/include/crm/common/acl.h
@@ -24,9 +24,6 @@ extern "C" {
  */
 
 void xml_acl_disable(xmlNode *xml);
-bool xml_acl_denied(const xmlNode *xml);
-
-bool pcmk_acl_required(const char *user);
 
 #ifdef __cplusplus
 }

diff --git a/include/crm/common/acl_compat.h b/include/crm/common/acl_compat.h
@@ -34,6 +34,12 @@ bool xml_acl_enabled(const xmlNode *xml);
 bool xml_acl_filtered_copy(const char *user, xmlNode *acl_source, xmlNode *xml,
                            xmlNode **result);
 
+//! \deprecated Do not use
+bool xml_acl_denied(const xmlNode *xml);
+
+//! \deprecated Do not use
+bool pcmk_acl_required(const char *user);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/crm/common/acl_internal.h b/include/crm/common/acl_internal.h
@@ -36,6 +36,21 @@ pcmk__is_privileged(const char *user)
     return user && (!strcmp(user, CRM_DAEMON_USER) || !strcmp(user, "root"));
 }
 
+/*!
+ * \internal
+ * \brief Check whether an ACL is required for a given user to access the CIB
+ *
+ * \param[in] user  User name
+ *
+ * \return \c true if \p user requires an ACL to access the CIB, or \c false
+ *         otherwise
+ */
+static inline bool
+pcmk__acl_required(const char *user)
+{
+    return !pcmk__str_empty(user) && !pcmk__is_privileged(user);
+}
+
 void pcmk__enable_acls(xmlDoc *source, xmlDoc *target, const char *user);
 
 xmlNode *pcmk__acl_filtered_copy(const char *user, xmlDoc *acl_source,

diff --git a/include/crm/common/output_internal.h b/include/crm/common/output_internal.h
@@ -757,11 +757,9 @@ void pcmk__output_set_log_filter(pcmk__output_t *out, const char *file,
  *
  * \param[in,out] out  The output functions structure.
  * \param[in]     name The name of the node to be created.
- * \param[in]     ...     Name/value pairs to set as XML properties.
  */
-xmlNodePtr
-pcmk__output_xml_create_parent(pcmk__output_t *out, const char *name, ...)
-G_GNUC_NULL_TERMINATED;
+xmlNode *
+pcmk__output_xml_create_parent(pcmk__output_t *out, const char *name);
 
 /*!
  * \internal
@@ -781,11 +779,9 @@ pcmk__output_xml_add_node_copy(pcmk__output_t *out, xmlNodePtr node);
  *
  * \param[in,out] out  The output functions structure.
  * \param[in]     name The name of the node to be created.
- * \param[in]     ...     Name/value pairs to set as XML properties.
  */
-xmlNodePtr
-pcmk__output_create_xml_node(pcmk__output_t *out, const char *name, ...)
-G_GNUC_NULL_TERMINATED;
+xmlNode *
+pcmk__output_create_xml_node(pcmk__output_t *out, const char *name);
 
 /*!
  * \internal

diff --git a/include/crm/common/xml_element_internal.h b/include/crm/common/xml_element_internal.h
@@ -85,31 +85,6 @@ void pcmk__xe_sort_attrs(xmlNode *xml);
 void pcmk__xe_set_id(xmlNode *xml, const char *format, ...)
     G_GNUC_PRINTF(2, 3);
 
-/*!
- * \internal
- * \brief Like pcmk__xe_set_props, but takes a va_list instead of
- *        arguments directly.
- *
- * \param[in,out] node   XML to add attributes to
- * \param[in]     pairs  NULL-terminated list of name/value pairs to add
- */
-void
-pcmk__xe_set_propv(xmlNodePtr node, va_list pairs);
-
-/*!
- * \internal
- * \brief Add a NULL-terminated list of name/value pairs to the given
- *        XML node as properties.
- *
- * \param[in,out] node XML node to add properties to
- * \param[in]     ...  NULL-terminated list of name/value pairs
- *
- * \note A NULL name terminates the arguments; a NULL value will be skipped.
- */
-void
-pcmk__xe_set_props(xmlNodePtr node, ...)
-G_GNUC_NULL_TERMINATED;
-
 /*!
  * \internal
  * \brief Get first attribute of an XML element

diff --git a/include/crm/common/xml_internal.h b/include/crm/common/xml_internal.h
@@ -34,6 +34,7 @@
 #include <crm/common/xml_idref_internal.h>
 #include <crm/common/xml_io_internal.h>
 #include <crm/common/xml_names_internal.h>
+#include <crm/common/xml_tracking_internal.h>
 #include <crm/common/xpath_internal.h>
 
 #include <libxml/relaxng.h>
@@ -260,7 +261,6 @@ enum pcmk__xml_escape_type {
     pcmk__xml_escape_attr_pretty,
 };
 
-bool pcmk__xml_needs_escape(const char *text, enum pcmk__xml_escape_type type);
 char *pcmk__xml_escape(const char *text, enum pcmk__xml_escape_type type);
 
 /*!
@@ -427,9 +427,8 @@ enum pcmk__xml_flags {
 void pcmk__xml_doc_set_flags(xmlDoc *doc, uint32_t flags);
 bool pcmk__xml_doc_all_flags_set(const xmlDoc *xml, uint32_t flags);
 
-void pcmk__xml_commit_changes(xmlDoc *doc);
-void pcmk__xml_mark_changes(xmlNode *old_xml, xmlNode *new_xml);
-
+bool pcmk__xml_foreach_child(xmlNode *xml, bool (*fn)(xmlNode *, void *),
+                             void *user_data);
 bool pcmk__xml_tree_foreach(xmlNode *xml, bool (*fn)(xmlNode *, void *),
                             void *user_data);
 

diff --git a/include/crm/common/xml_tracking_internal.h b/include/crm/common/xml_tracking_internal.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017-2025 the Pacemaker project contributors
+ *
+ * The version control history for this file may have further details.
+ *
+ * This source code is licensed under the GNU Lesser General Public License
+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
+ */
+
+#ifndef PCMK__CRM_COMMON_XML_TRACKING_INTERNAL__H
+#define PCMK__CRM_COMMON_XML_TRACKING_INTERNAL__H
+
+/*
+ * Internal-only functions for tracking, calculating, and committing XML changes
+ */
+
+#include <libxml/tree.h>    // xmlDoc, xmlNode
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void pcmk__xml_mark_changes(xmlNode *old_xml, xmlNode *new_xml);
+void pcmk__xml_commit_changes(xmlDoc *doc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // PCMK__CRM_COMMON_XML_TRACKING_INTERNAL__H
diff --git a/include/crm/pengine/internal.h b/include/crm/pengine/internal.h
@@ -79,8 +79,6 @@ gchar *pcmk__native_output_string(const pcmk_resource_t *rsc, const char *name,
                                   const pcmk_node_t *node, uint32_t show_opts,
                                   const char *target_role, bool show_nodes);
 
-int pe__name_and_nvpairs_xml(pcmk__output_t *out, bool is_list, const char *tag_name,
-                             ...) G_GNUC_NULL_TERMINATED;
 char *pe__node_display_name(pcmk_node_t *node, bool print_detail);
 
 

diff --git a/lib/cib/cib_remote.c b/lib/cib/cib_remote.c
@@ -505,12 +505,10 @@ cib_tls_signon(cib_t *cib, pcmk__remote_t *connection, gboolean event_channel)
 
     /* login to server */
     login = pcmk__xe_create(NULL, PCMK__XE_CIB_COMMAND);
-    pcmk__xe_set_props(login,
-                       PCMK_XA_OP, "authenticate",
-                       PCMK_XA_USER, private->user,
-                       PCMK__XA_PASSWORD, private->passwd,
-                       PCMK__XA_HIDDEN, PCMK__VALUE_PASSWORD,
-                       NULL);
+    pcmk__xe_set(login, PCMK_XA_OP, "authenticate");
+    pcmk__xe_set(login, PCMK_XA_USER, private->user);
+    pcmk__xe_set(login, PCMK__XA_PASSWORD, private->passwd);
+    pcmk__xe_set(login, PCMK__XA_HIDDEN, PCMK__VALUE_PASSWORD);
 
     pcmk__remote_send_xml(connection, login);
     pcmk__xml_free(login);

diff --git a/lib/cib/cib_utils.c b/lib/cib/cib_utils.c
@@ -156,7 +156,7 @@ cib_acl_enabled(xmlNode *xml, const char *user)
     GHashTable *options = NULL;
     bool rc = false;
 
-    if ((xml == NULL) || !pcmk_acl_required(user)) {
+    if ((xml == NULL) || !pcmk__acl_required(user)) {
         return false;
     }
 
@@ -579,7 +579,7 @@ cib__perform_op_rw(enum cib_variant variant, cib__op_fn_t fn, xmlNode *req,
     // Allow ourselves to make any additional necessary changes
     xml_acl_disable(*cib);
 
-    if (xml_acl_denied(*cib)) {
+    if (pcmk__xml_doc_all_flags_set((*cib)->doc, pcmk__xf_acl_denied)) {
         pcmk__trace("ACL rejected part or all of the proposed changes");
         rc = EACCES;
         goto done;

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
@@ -107,6 +107,7 @@ libcrmcommon_la_SOURCES	+= xml_display.c
 libcrmcommon_la_SOURCES	+= xml_element.c
 libcrmcommon_la_SOURCES	+= xml_idref.c
 libcrmcommon_la_SOURCES	+= xml_io.c
+libcrmcommon_la_SOURCES	+= xml_tracking.c
 libcrmcommon_la_SOURCES	+= xpath.c
 
 #