Merge pull request #4039 from nrwahl2/nrwahl2-acls_first

ACL refactors: Functionize more of the unpacking stage

Author: clumens

include/crm/common/acl_internal.h

@@ -36,7 +36,7 @@ pcmk__is_privileged(const char *user)
     return user && (!strcmp(user, CRM_DAEMON_USER) || !strcmp(user, "root"));
 }
 
-void pcmk__enable_acl(xmlNode *acl_source, xmlNode *target, const char *user);
+void pcmk__enable_acls(xmlDoc *source, xmlDoc *target, const char *user);
 
 bool pcmk__check_acl(xmlNode *xml, const char *attr_name,
                      enum pcmk__xml_flags mode);

lib/cib/cib_utils.c

@@ -320,7 +320,7 @@ cib_perform_op(cib_t *cib, const char *op, uint32_t call_options,
         pcmk__xml_commit_changes(scratch->doc);
         pcmk__xml_doc_set_flags(scratch->doc, pcmk__xf_tracking);
         if (enable_acl) {
-            pcmk__enable_acl(*current_cib, scratch, user);
+            pcmk__enable_acls((*current_cib)->doc, scratch->doc, user);
         }
 
         pcmk__trace("Processing %s for section '%s', user '%s'", op,
@@ -343,7 +343,7 @@ cib_perform_op(cib_t *cib, const char *op, uint32_t call_options,
 
         pcmk__xml_doc_set_flags(scratch->doc, pcmk__xf_tracking);
         if (enable_acl) {
-            pcmk__enable_acl(*current_cib, scratch, user);
+            pcmk__enable_acls((*current_cib)->doc, scratch->doc, user);
         }
 
         pcmk__trace("Processing %s for section '%s', user '%s'", op,
@@ -361,7 +361,7 @@ cib_perform_op(cib_t *cib, const char *op, uint32_t call_options,
             pcmk__trace("Inferring changes after %s op", op);
             pcmk__xml_commit_changes(scratch->doc);
             if (enable_acl) {
-                pcmk__enable_acl(*current_cib, scratch, user);
+                pcmk__enable_acls((*current_cib)->doc, scratch->doc, user);
             }
             pcmk__xml_mark_changes(*current_cib, scratch);
         }