Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: lib by andrew from
([email protected])
2. Linux-HA CVS: mgmt by zhenh from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 5 Apr 2006 02:05:27 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/cib
Modified Files:
cib_attrs.c
Log Message:
Make sure we can read crm_config options in cluster_property_sets
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_attrs.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- cib_attrs.c 5 Apr 2006 07:37:37 -0000 1.16
+++ cib_attrs.c 5 Apr 2006 08:05:26 -0000 1.17
@@ -1,4 +1,4 @@
-/* $Id: cib_attrs.c,v 1.16 2006/04/05 07:37:37 andrew Exp $ */
+/* $Id: cib_attrs.c,v 1.17 2006/04/05 08:05:26 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -145,6 +145,8 @@
{
const char *tag = NULL;
enum cib_errors rc = cib_ok;
+ gboolean is_crm_config = FALSE;
+
crm_data_t *xml_obj = NULL;
crm_data_t *xml_next = NULL;
crm_data_t *fragment = NULL;
@@ -184,6 +186,7 @@
if(safe_str_eq(section, XML_CIB_TAG_CRMCONFIG)) {
tag = NULL;
+ is_crm_config = TRUE;
} else if(safe_str_eq(section, XML_CIB_TAG_NODES)) {
tag = XML_CIB_TAG_NODE;
@@ -216,7 +219,11 @@
xml_obj = xml_next;
}
if(set_name != NULL) {
- xml_next = find_entity(xml_obj, XML_TAG_ATTR_SETS, set_name);
+ if(is_crm_config) {
+ xml_next = find_entity(xml_obj, XML_CIB_TAG_PROPSET,
set_name);
+ } else {
+ xml_next = find_entity(xml_obj, XML_TAG_ATTR_SETS,
set_name);
+ }
if(xml_next == NULL) {
crm_debug("%s=%s object not found in %s",
XML_TAG_ATTR_SETS, set_name,
------------------------------
Message: 2
Date: Wed, 5 Apr 2006 03:01:23 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
using cluster_property_set instead of nvpair
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- mgmt_crm.c 4 Apr 2006 06:56:33 -0000 1.22
+++ mgmt_crm.c 5 Apr 2006 09:01:22 -0000 1.23
@@ -402,7 +402,9 @@
char xml[MAX_STRLEN];
ARGC_CHECK(3);
- snprintf(xml, MAX_STRLEN, "<nvpair id=\"%s\" name=\"%s\"
value=\"%s\"/>", argv[1],argv[1],argv[2]);
+ snprintf(xml, MAX_STRLEN, "<cluster_property_set
id=\"default-options\"><attributes>"
+ "<nvpair id=\"%s\" name=\"%s\"
value=\"%s\"/></attributes></cluster_property_set>"
+ , argv[1],argv[1],argv[2]);
cib_object = string2xml(xml);
if(cib_object == NULL) {
------------------------------
Message: 3
Date: Wed, 5 Apr 2006 03:59:35 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/admin
Modified Files:
crm_verify.c
Log Message:
Actually this is all for 2.0.4 compatability, not .5
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_verify.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- crm_verify.c 4 Apr 2006 14:23:21 -0000 1.7
+++ crm_verify.c 5 Apr 2006 09:59:35 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Id: crm_verify.c,v 1.7 2006/04/04 14:23:21 andrew Exp $ */
+/* $Id: crm_verify.c,v 1.8 2006/04/05 09:59:35 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -205,7 +205,7 @@
write_xml_file(cib_object, cib_save, FALSE);
}
-#if CRM_DEPRECATED_SINCE_2_0_5
+#if CRM_DEPRECATED_SINCE_2_0_4
status = get_object_root(XML_CIB_TAG_STATUS, cib_object);
xml_child_iter(status, node_state, XML_CIB_TAG_STATE,
xml_remove_prop(node_state, XML_CIB_TAG_LRM);
------------------------------
Message: 4
Date: Wed, 5 Apr 2006 03:59:35 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/cib
Modified Files:
io.c
Log Message:
Actually this is all for 2.0.4 compatability, not .5
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- io.c 4 Apr 2006 17:27:28 -0000 1.58
+++ io.c 5 Apr 2006 09:59:35 -0000 1.59
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.58 2006/04/04 17:27:28 andrew Exp $ */
+/* $Id: io.c,v 1.59 2006/04/05 09:59:35 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -478,7 +478,7 @@
{
int error_code = cib_ok;
crm_data_t *saved_cib = get_the_CIB();
-#if !CRM_DEPRECATED_SINCE_2_0_5
+#if !CRM_DEPRECATED_SINCE_2_0_4
const char *ignore_dtd = NULL;
#endif
@@ -489,7 +489,7 @@
crm_validate_data(saved_cib);
}
-#if !CRM_DEPRECATED_SINCE_2_0_5
+#if !CRM_DEPRECATED_SINCE_2_0_4
ignore_dtd = crm_element_value(new_cib, "ignore_dtd");
if(crm_is_true(ignore_dtd) == FALSE
&& validate_with_dtd(new_cib, HA_LIBDIR"/heartbeat/crm.dtd") ==
FALSE) {
------------------------------
Message: 5
Date: Wed, 5 Apr 2006 03:59:36 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
lrm.c
Log Message:
Actually this is all for 2.0.4 compatability, not .5
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -3 -r1.179 -r1.180
--- lrm.c 4 Apr 2006 13:05:22 -0000 1.179
+++ lrm.c 5 Apr 2006 09:59:35 -0000 1.180
@@ -489,7 +489,7 @@
*/
crm_data_t *args_xml = NULL;
char *digest = NULL;
-#if CRM_DEPRECATED_SINCE_2_0_5
+#if CRM_DEPRECATED_SINCE_2_0_4
args_xml = create_xml_node(xml_op, XML_TAG_PARAMS);
#else
args_xml = create_xml_node(NULL, XML_TAG_PARAMS);
@@ -498,8 +498,7 @@
filter_action_parameters(args_xml);
digest = calculate_xml_digest(args_xml, TRUE);
crm_xml_add(xml_op, XML_LRM_ATTR_OP_DIGEST, digest);
-#if CRM_DEPRECATED_SINCE_2_0_5
-#else
+#if !CRM_DEPRECATED_SINCE_2_0_4
free_xml(args_xml);
#endif
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 24
********************************************
