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: lib by lars from ([email protected])
3. Linux-HA CVS: resources by horms from
([email protected])
4. Linux-HA CVS: include by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 10 May 2006 12:14:17 -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:
Correctly observe the "default" option
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -3 -r1.193 -r1.194
--- unpack.c 9 May 2006 09:27:29 -0000 1.193
+++ unpack.c 10 May 2006 18:14:15 -0000 1.194
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.193 2006/05/09 09:27:29 andrew Exp $ */
+/* $Id: unpack.c,v 1.194 2006/05/10 18:14:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1039,7 +1039,7 @@
}
value = g_hash_table_lookup(rsc->parameters, XML_RSC_ATTR_TARGET_ROLE);
- if(value != NULL) {
+ if(value != NULL && safe_str_neq("default", value)) {
enum rsc_role_e req_role = text2role(value);
if(req_role != RSC_ROLE_UNKNOWN && req_role != rsc->next_role){
crm_debug("%s: Overwriting calculated next role %s"
------------------------------
Message: 2
Date: Wed, 10 May 2006 13:14:53 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/hbclient
Modified Files:
client_lib.c
Log Message:
Coverity #40: Possible NULL pointer dereferences.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/hbclient/client_lib.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- client_lib.c 24 Apr 2006 00:01:21 -0000 1.39
+++ client_lib.c 10 May 2006 19:14:49 -0000 1.40
@@ -1,4 +1,4 @@
-/* $Id: client_lib.c,v 1.39 2006/04/24 00:01:21 alan Exp $ */
+/* $Id: client_lib.c,v 1.40 2006/05/10 19:14:49 lars Exp $ */
/*
* client_lib: heartbeat API client side code
*
@@ -2186,30 +2186,36 @@
if ((strcasecmp(mtype, T_STATUS) == 0
|| strcasecmp(mtype, T_NS_STATUS) == 0)) {
/* If DEADSTATUS, cleanup order queue for the node */
- if (strcmp(ha_msg_value(msg, F_STATUS), DEADSTATUS) == 0) {
+ const char *mstatus = ha_msg_value(msg, F_STATUS);
+ if (mstatus && (strcmp(mstatus, DEADSTATUS) == 0)) {
order_queue_t * oq = p->order_queue_head;
order_queue_t * prev;
order_queue_t * next;
int i;
for (prev = NULL; oq != NULL; prev = oq, oq = oq->next){
- if (strcmp(oq->from_node
- , ha_msg_value(msg, F_ORIG)) == 0)
+ const char *morig = ha_msg_value(msg, F_ORIG);
+ if (morig && (strcmp(oq->from_node, morig)
+ == 0)) {
break;
+ }
}
if (oq){
next = oq->next;
for (i = 0; i < MAXMSGHIST; i++){
- if (oq->node.orderQ[i])
+ if (oq->node.orderQ[i]) {
ZAPMSG(oq->node.orderQ[i]);
- if (oq->cluster.orderQ[i])
+ }
+ if (oq->cluster.orderQ[i]) {
ZAPMSG(oq->cluster.orderQ[i]);
+ }
}
ha_free(oq);
- if (prev)
+ if (prev) {
prev->next = next;
- else
+ } else {
p->order_queue_head = next;
+ }
}
}
if (p->node_callback) {
------------------------------
Message: 3
Date: Wed, 10 May 2006 19:04:36 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/heartbeat
Modified Files:
LVSSyncDaemonSwap.in
Log Message:
Bug: 1249
the problem appears to be that %% has been used as a pattern matching
address, however (on the version of sed that I have at least) only //
is valid (as opposed to in subsittutions where /, %, and pretty much
any other character are valid delimiters.
I have changed the address over to use / instead of %. I also changed
the pattern matches for not much reason other than to use / consistently
and thus IMHO make things slightly easier to read.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/heartbeat/LVSSyncDaemonSwap.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- LVSSyncDaemonSwap.in 8 Nov 2005 08:59:39 -0000 1.6
+++ LVSSyncDaemonSwap.in 11 May 2006 01:04:34 -0000 1.7
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: LVSSyncDaemonSwap.in,v 1.6 2005/11/08 08:59:39 xunsun Exp $
+# $Id: LVSSyncDaemonSwap.in,v 1.7 2006/05/11 01:04:34 horms Exp $
#
# Copyright (C) 2005 Horms <[EMAIL PROTECTED]>
#
@@ -67,12 +67,12 @@
get_status $1
RC=$?
- pid=$(echo "$PS" | sed -e '% [ipvs[ _]syncmaster]$%!d' -e 's%^ *%%' -e 's%
.*$%%')
+ pid=$(echo "$PS" | sed -e '/ \[ipvs[ _]syncmaster\]$/!d' -e 's/^ *//' -e
's/ .*$//')
if [ ! -z "$pid" ]; then
echo "(ipvs_syncmaster pid: $pid)"
fi
- pid=$(echo "$PS" | sed -e '% [ipvs[ _]syncbackup]$%!d' -e 's%^ *%%' -e 's%
.*$%%')
+ pid=$(echo "$PS" | sed -e '/ \[ipvs[ _]syncbackup\]$/!d' -e 's/^ *//' -e
's/ .*$//')
if [ ! -z "$pid" ]; then
echo "(ipvs_syncbackup pid: $pid)"
fi
------------------------------
Message: 4
Date: Wed, 10 May 2006 20:43:08 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/mgmt
Modified Files:
mgmt_common.h
Log Message:
add the support of the parameter of group
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/mgmt/mgmt_common.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- mgmt_common.h 9 May 2006 06:00:07 -0000 1.6
+++ mgmt_common.h 11 May 2006 02:43:08 -0000 1.7
@@ -355,6 +355,10 @@
add a new group
format:
MSG_ADD_GRP group
+ param_id1 param_name1 param_value1
+ param_id2 param_name2 param_value2
+ ...
+ param_idn param_namen param_valuen
return:
MSG_OK
or
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 26
********************************************
