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: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 4 Apr 2006 11:18:06 -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/common
Modified Files:
utils.c
Log Message:
sanity checking
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- utils.c 3 Apr 2006 16:47:21 -0000 1.40
+++ utils.c 4 Apr 2006 17:18:06 -0000 1.41
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.40 2006/04/03 16:47:21 andrew Exp $ */
+/* $Id: utils.c,v 1.41 2006/04/04 17:18:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1180,6 +1180,10 @@
};
int lpc = 0;
+
+ if(param_set == NULL) {
+ return;
+ }
for(lpc = 0; lpc < DIMOF(attr_filter); lpc++) {
xml_remove_prop(param_set, attr_filter[lpc]);
------------------------------
Message: 2
Date: Tue, 4 Apr 2006 11:25:21 -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/pengine
Modified Files:
unpack.c
Log Message:
params wont always be present
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -3 -r1.179 -r1.180
--- unpack.c 4 Apr 2006 13:05:22 -0000 1.179
+++ unpack.c 4 Apr 2006 17:25:21 -0000 1.180
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.179 2006/04/04 13:05:22 andrew Exp $ */
+/* $Id: unpack.c,v 1.180 2006/04/04 17:25:21 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1160,17 +1160,19 @@
if(safe_str_neq(pnow_digest, param_digest)) {
crm_data_t *params = find_xml_node(xml_op,XML_TAG_PARAMS,FALSE);
- crm_data_t *local_params = copy_xml(params);
- filter_action_parameters(local_params);
+ if(params) {
+ crm_data_t *local_params = copy_xml(params);
+ filter_action_parameters(local_params);
+
+ crm_log_xml_err(pnow, "params:calc");
+ crm_log_xml_err(local_params, "params:used");
+ free_xml(local_params);
+ }
- crm_log_xml_err(pnow, "params:calc");
- crm_log_xml_err(local_params, "params:used");
- free_xml(local_params);
-
did_change = TRUE;
crm_info("Parameters to %s action changed: %s vs. %s",
id, pnow_digest, param_digest);
-
+
custom_action(rsc, crm_strdup(id), task, NULL,
FALSE, TRUE, data_set);
------------------------------
Message: 3
Date: Tue, 4 Apr 2006 11:27:28 -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:
Hook the CIB up to discard updates that break DTD validation
(but only after we no longer support 2.0.5 because it still sends
resource updates that aren't specifyable in the DTD)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- io.c 3 Apr 2006 15:56:09 -0000 1.57
+++ io.c 4 Apr 2006 17:27:28 -0000 1.58
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.57 2006/04/03 15:56:09 andrew Exp $ */
+/* $Id: io.c,v 1.58 2006/04/04 17:27:28 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -478,6 +478,9 @@
{
int error_code = cib_ok;
crm_data_t *saved_cib = get_the_CIB();
+#if !CRM_DEPRECATED_SINCE_2_0_5
+ const char *ignore_dtd = NULL;
+#endif
crm_log_xml_debug_4(new_cib, "Attempting to activate CIB");
@@ -485,7 +488,15 @@
if(saved_cib != NULL) {
crm_validate_data(saved_cib);
}
-
+
+#if !CRM_DEPRECATED_SINCE_2_0_5
+ 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) {
+ error_code = cib_dtd_validation;
+ crm_err("Ignoring invalid CIB");
+ } else
+#endif
if (initializeCib(new_cib) == FALSE) {
error_code = cib_ACTIVATION;
crm_err("Ignoring invalid or NULL CIB");
------------------------------
_______________________________________________
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 20
********************************************
