Refactor: libcrmcommon: Drop xml_acl_enabled() internally

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

lib/common/acl.c

@@ -216,16 +216,20 @@ void
 pcmk__apply_acl(xmlNode *xml)
 {
     GList *aIter = NULL;
-    xml_doc_private_t *docpriv = xml->doc->_private;
-    xml_node_private_t *nodepriv;
+    xml_doc_private_t *docpriv = NULL;
+    xml_node_private_t *nodepriv = NULL;
     xmlXPathObject *xpathObj = NULL;
 
-    if (!xml_acl_enabled(xml)) {
+    pcmk__assert(xml != NULL);
+
+    if (!pcmk__xml_doc_all_flags_set(xml->doc, pcmk__xf_acl_enabled)) {
         crm_trace("Skipping ACLs for user '%s' because not enabled for this XML",
                   docpriv->acl_user);
         return;
     }
 
+    docpriv = xml->doc->_private;
+
     for (aIter = docpriv->acls; aIter != NULL; aIter = aIter->next) {
         int max = 0, lpc = 0;
         xml_acl_t *acl = aIter->data;
@@ -681,7 +685,9 @@ xml_acl_denied(const xmlNode *xml)
 void
 xml_acl_disable(xmlNode *xml)
 {
-    if (xml_acl_enabled(xml)) {
+    if ((xml != NULL)
+        && pcmk__xml_doc_all_flags_set(xml->doc, pcmk__xf_acl_enabled)) {
+
         xml_doc_private_t *docpriv = xml->doc->_private;
 
         /* Catch anything that was created but shouldn't have been */
@@ -749,8 +755,8 @@ pcmk__check_acl(xmlNode *xml, const char *attr_name, enum pcmk__xml_flags mode)
 
     pcmk__assert((xml != NULL) && (xml->doc->_private != NULL));
 
-    if (!pcmk__xml_doc_all_flags_set(xml->doc, pcmk__xf_tracking)
-        || !xml_acl_enabled(xml)) {
+    if (!pcmk__xml_doc_all_flags_set(xml->doc,
+                                     pcmk__xf_tracking|pcmk__xf_acl_enabled)) {
         return true;
     }
 

lib/common/tests/acl/Makefile.am

@@ -1,5 +1,5 @@
 #
-# Copyright 2021-2024 the Pacemaker project contributors
+# Copyright 2021-2025 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
@@ -15,7 +15,6 @@ include $(top_srcdir)/mk/unittest.mk
 
 check_PROGRAMS = pcmk__is_user_in_group_test 	\
 		 pcmk_acl_required_test 	\
-		 xml_acl_denied_test 		\
-		 xml_acl_enabled_test
+		 xml_acl_denied_test
 
 TESTS = $(check_PROGRAMS)