Bug cl#5181 - corosync: Ensure node IDs are written to the CIB as uns…

…igned integers
ClusterLabs · Nov 18, 2013 · a269ba8 · a269ba8
1 parent 5a69be5
commit a269ba8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/cluster/corosync.c b/lib/cluster/corosync.c
@@ -538,9 +538,12 @@ corosync_initialize_nodelist(void *cluster, gboolean force_member, xmlNode * xml
             any = TRUE;
 
             if (xml_parent) {
+                char buffer[64];
                 xmlNode *node = create_xml_node(xml_parent, XML_CIB_TAG_NODE);
 
-                crm_xml_add_int(node, XML_ATTR_ID, nodeid);
+                if(snprintf(buffer, 63, "%u", nodeid) > 0) {
+                    crm_xml_add(node, XML_ATTR_ID, buffer);
+                }
                 crm_xml_add(node, XML_ATTR_UNAME, name);
                 if (force_member) {
                     crm_xml_add(node, XML_ATTR_TYPE, CRM_NODE_MEMBER);

diff --git a/tools/crm_node.c b/tools/crm_node.c
@@ -167,7 +167,11 @@ int tools_remove_node_cache(const char *node, const char *target)
                          NULL, NULL, CRM_SYSTEM_CRMD, "crm_node", admin_uuid);
 
     if (n) {
-        crm_xml_add_int(cmd, XML_ATTR_ID, n);
+        char buffer[64];
+
+        if(snprintf(buffer, 63, "%u", n) > 0) {
+            crm_xml_add(cmd, XML_ATTR_ID, buffer);
+        }
     }
     crm_xml_add(cmd, XML_ATTR_UNAME, name);