File pacemaker-libcib-convenience-function-sanitizin... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-libcib-convenience-function-sanitizing-ID.patch of Package pacemaker

commit b33d343ff39247d84cf94706b5263fea38273674
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Tue Apr 4 16:18:52 2017 -0500

Refactor: libcib: use new convenience function for sanitizing ID
    
    so we get any future improvements in the sanitization

diff --git a/lib/cib/cib_attrs.c b/lib/cib/cib_attrs.c
index a2b118f00..0f5d5a718 100644
--- a/lib/cib/cib_attrs.c
+++ b/lib/cib/cib_attrs.c
@@ -266,20 +266,10 @@ update_attr_delegate(cib_t * the_cib, int call_options,
         }
 
         if (attr_id == NULL) {
-            int lpc = 0;
-
             local_attr_id = crm_concat(set_name, attr_name, '-');
+            crm_xml_sanitize_id(local_attr_id);
             attr_id = local_attr_id;
 
-            /* Minimal attempt at sanitizing automatic IDs */
-            for (lpc = 0; local_attr_id[lpc] != 0; lpc++) {
-                switch (local_attr_id[lpc]) {
-                    case ':':
-                    case '#':
-                        local_attr_id[lpc] = '.';
-                }
-            }
-
         } else if (attr_name == NULL) {
             attr_name = attr_id;
         }

Places

File pacemaker-libcib-convenience-function-sanitizing-ID.patch of Package pacemaker

Places