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: crm by andrew from
([email protected])
2. Linux-HA CVS: cts by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: resources by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 2 Feb 2006 04:57:57 -0700 (MST)
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:
callbacks.c
Log Message:
Fix a couple of crashes found with CTS
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- callbacks.c 2 Feb 2006 11:10:32 -0000 1.102
+++ callbacks.c 2 Feb 2006 11:57:57 -0000 1.103
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.102 2006/02/02 11:10:32 andrew Exp $ */
+/* $Id: callbacks.c,v 1.103 2006/02/02 11:57:57 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -194,7 +194,7 @@
{CIB_OP_QUERY, FALSE, FALSE, FALSE, cib_prepare_none,
cib_cleanup_query, cib_process_query},
{CIB_OP_MODIFY, TRUE, TRUE, TRUE, cib_prepare_data,
cib_cleanup_output, cib_process_modify},
{CIB_OP_UPDATE, TRUE, TRUE, TRUE, cib_prepare_data,
cib_cleanup_output, cib_process_change},
- {CIB_OP_APPLY_DIFF,TRUE, TRUE, TRUE, cib_prepare_diff,
cib_cleanup_none, cib_process_diff},
+ {CIB_OP_APPLY_DIFF,TRUE, TRUE, TRUE, cib_prepare_diff,
cib_cleanup_sync, cib_process_diff},
{CIB_OP_SLAVE, FALSE, TRUE, FALSE, cib_prepare_none,
cib_cleanup_none, cib_process_readwrite},
{CIB_OP_SLAVEALL, TRUE, TRUE, FALSE, cib_prepare_none,
cib_cleanup_none, cib_process_readwrite},
{CIB_OP_SYNC_ONE, FALSE, TRUE, FALSE, cib_prepare_sync,
cib_cleanup_sync, cib_process_sync_one},
@@ -714,7 +714,9 @@
crm_debug("Processing global/peer update from %s"
" that originated from us", originator);
needs_reply = FALSE;
- local_notify = TRUE;
+ if(cl_get_string(request, F_CIB_CLIENTID) != NULL) {
+ local_notify = TRUE;
+ }
} else if(crm_is_true(update)) {
crm_debug("Processing global/peer update from %s", originator);
@@ -871,7 +873,7 @@
if(local_rc != cib_ok) {
crm_warn("%sSync reply to %s failed: %s",
(call_options & cib_sync_call)?"":"A-",
- client_obj->name, cib_error2string(local_rc));
+ client_obj?client_obj->name:"<unknown>",
cib_error2string(local_rc));
crm_log_message(LOG_DEBUG, op_reply);
}
}
------------------------------
Message: 2
Date: Thu, 2 Feb 2006 06:40:29 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CM_LinuxHAv2.py.in
Log Message:
Check for correct permissions on the CIB at startup
Have CTS apply the correct permissions to the CIB it installs
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CM_LinuxHAv2.py.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- CM_LinuxHAv2.py.in 20 Jan 2006 14:03:06 -0000 1.130
+++ CM_LinuxHAv2.py.in 2 Feb 2006 13:40:28 -0000 1.131
@@ -323,6 +323,8 @@
if 0!=self.rsh.cp(self.Env["CIBfilename"],
"root@" + (self["CIBfile"]%node)):
raise ValueError("Can not scp file to %s "%node)
+
+ self.rsh.remote_python_call(node, "os", "system", "chown
@HA_CCMUID@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml")
def prepare(self):
'''Finish the Initialization process. Prepare to test...'''
------------------------------
Message: 3
Date: Thu, 2 Feb 2006 06:40:29 -0700 (MST)
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:
Check for correct permissions on the CIB at startup
Have CTS apply the correct permissions to the CIB it installs
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- io.c 20 Jan 2006 09:30:37 -0000 1.41
+++ io.c 2 Feb 2006 13:40:28 -0000 1.42
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.41 2006/01/20 09:30:37 andrew Exp $ */
+/* $Id: io.c,v 1.42 2006/02/02 13:40:28 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -124,7 +124,26 @@
}
if (s_res == 0) {
- FILE *cib_file = fopen(filename, "r");
+ FILE *cib_file = NULL;
+ gboolean user_readwritable = (buf.st_gid == atoi(HA_CCMUID)) &&
(buf.st_mode & (S_IRGRP|S_IWGRP));
+
+ if( S_ISREG(buf.st_mode) == FALSE ) {
+ crm_err("%s must be a regular file", filename);
+ exit(100);
+
+ } else if( user_readwritable == FALSE ) {
+ gboolean group_readwritable = (buf.st_uid ==
atoi(HA_APIGID)) && (buf.st_mode & (S_IRUSR|S_IWUSR));
+ if( group_readwritable == FALSE ) {
+ crm_err("%s must be owned and read/writeable by
user %s,"
+ " or owned and read/writable by group
%s",
+ filename, HA_CCMUID, HA_APIGID);
+ exit(100);
+ }
+ crm_warn("%s should be owned and read/writeable by user
%s",
+ filename, HA_CCMUID);
+ }
+
+ cib_file = fopen(filename, "r");
crm_info("Reading cluster configuration from: %s", filename);
root = file2xml(cib_file);
crm_xml_add(root, "generated", XML_BOOLEAN_FALSE);
------------------------------
Message: 4
Date: Thu, 2 Feb 2006 07:21:09 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
ClusterMon.in
Log Message:
Fix the default
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ClusterMon.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ClusterMon.in 20 Dec 2005 08:34:47 -0000 1.7
+++ ClusterMon.in 2 Feb 2006 14:21:08 -0000 1.8
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: ClusterMon.in,v 1.7 2005/12/20 08:34:47 zhenh Exp $
+# $Id: ClusterMon.in,v 1.8 2006/02/02 14:21:08 andrew Exp $
#
# ClusterMon OCF RA. Does nothing but wait a few seconds, can be
# configured to fail occassionally.
@@ -61,7 +61,7 @@
The user we want to run crm_mon as
</longdesc>
<shortdesc lang="en">The user we want to run crm_mon as</shortdesc>
-<content type="string" default="15" />
+<content type="string" default="root" />
</parameter>
<parameter name="update" unique="0">
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 7
*******************************************
