High: cib: Remove text nodes from cib replace operations

beekhof · Dec 17, 2012 · c2550cb · c2550cb
1 parent 3035414
commit c2550cb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/include/crm_internal.h b/include/crm_internal.h
@@ -205,6 +205,7 @@ void crm_send_remote_msg(void *session, xmlNode * msg, gboolean encrypted);
 const char *daemon_option(const char *option);
 void set_daemon_option(const char *option, const char *value);
 gboolean daemon_option_enabled(const char *daemon, const char *option);
+void strip_text_nodes(xmlNode *xml);
 
 #  define crm_config_err(fmt...) { crm_config_error = TRUE; crm_err(fmt); }
 #  define crm_config_warn(fmt...) { crm_config_warning = TRUE; crm_warn(fmt); }

diff --git a/lib/cib/cib_utils.c b/lib/cib/cib_utils.c
@@ -501,6 +501,7 @@ cib_perform_op(const char *op, int call_options, cib_op_t * fn, gboolean is_quer
     }
 
     if (rc == pcmk_ok) {
+        strip_text_nodes(scratch);
         fix_plus_plus_recursive(scratch);
         current_dtd = crm_element_value(scratch, XML_ATTR_VALIDATION);
 

diff --git a/lib/common/xml.c b/lib/common/xml.c
@@ -696,7 +696,7 @@ decompress_file(const char *filename)
     return buffer;
 }
 
-static void strip_text_nodes(xmlNode *xml) 
+void strip_text_nodes(xmlNode *xml) 
 {
     xmlNode *iter = xml->children;