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: resources by zhenh from
([email protected])
2. Linux-HA CVS: crm by andrew 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: mgmt by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 10 Mar 2006 02:33:31 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
Makefile.am
Log Message:
add a header file path so we can compile IPv6addr.c
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Makefile.am 20 Dec 2005 08:04:21 -0000 1.11
+++ Makefile.am 10 Mar 2006 09:33:30 -0000 1.12
@@ -19,7 +19,7 @@
#
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha
ocfdir = @OCF_RA_DIR@/heartbeat
------------------------------
Message: 2
Date: Fri, 10 Mar 2006 03:08:35 -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:
Catch empty backup filenames
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- io.c 9 Mar 2006 10:04:50 -0000 1.50
+++ io.c 10 Mar 2006 10:08:35 -0000 1.51
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.50 2006/03/09 10:04:50 andrew Exp $ */
+/* $Id: io.c,v 1.51 2006/03/10 10:08:35 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -450,10 +450,17 @@
"%s.%s", oldname, ext);
}
+ if(backup_file == NULL || strlen(backup_file) == 0) {
+ crm_err("%s backup filename was %s",
+ newname == NULL?"calculated":"supplied",
+ backup_file == NULL?"null":"empty");
+ rc = -4;
+ }
+
s_res = stat(backup_file, &tmp);
/* unlink the old backup */
- if (s_res >= 0) {
+ if (rc == 0 && s_res >= 0) {
res = unlink(backup_file);
if (res < 0) {
cl_perror("Could not unlink %s", backup_file);
------------------------------
Message: 3
Date: Fri, 10 Mar 2006 03:09:07 -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:
messages.c
Log Message:
Only attach the failed tag if the update in fact failed.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/messages.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- messages.c 21 Feb 2006 14:39:44 -0000 1.67
+++ messages.c 10 Mar 2006 10:09:07 -0000 1.68
@@ -1,4 +1,4 @@
-/* $Id: messages.c,v 1.67 2006/02/21 14:39:44 andrew Exp $ */
+/* $Id: messages.c,v 1.68 2006/03/10 10:09:07 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -696,9 +696,9 @@
result = cib_unknown;
}
crm_log_xml_err(failed, "CIB Update failures");
+ *answer = failed;
}
- *answer = failed;
return result;
}
------------------------------
Message: 4
Date: Fri, 10 Mar 2006 03:15:45 -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:
We already know how big backup_file is, dont bother with strlen()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- io.c 10 Mar 2006 10:08:35 -0000 1.51
+++ io.c 10 Mar 2006 10:15:45 -0000 1.52
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.51 2006/03/10 10:08:35 andrew Exp $ */
+/* $Id: io.c,v 1.52 2006/03/10 10:15:45 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -442,12 +442,12 @@
backup_file = crm_strdup(newname);
} else {
- crm_malloc0(backup_file, 1024);
+ int max_name_len = 1024;
+ crm_malloc0(backup_file, sizeof(char) * max_name_len);
if (ext == NULL) {
ext = back_ext;
}
- snprintf(backup_file, strlen(backup_file)-1,
- "%s.%s", oldname, ext);
+ snprintf(backup_file, max_name_len - 1, "%s.%s", oldname, ext);
}
if(backup_file == NULL || strlen(backup_file) == 0) {
------------------------------
Message: 5
Date: Fri, 10 Mar 2006 03:47:39 -0700 (MST)
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/client
Modified Files:
haclient.py.in
Log Message:
fix some typo errors, thanks Robert
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- haclient.py.in 3 Mar 2006 09:15:36 -0000 1.10
+++ haclient.py.in 10 Mar 2006 10:47:39 -0000 1.11
@@ -632,11 +632,11 @@
make_label_active(self.glade.get_widget("l_keepalive"),_("Keep
Alive:"),"www.linux-ha.org")
make_label_active(self.glade.get_widget("l_warntime"),_("Warning
Alive:"),"www.linux-ha.org")
make_label_active(self.glade.get_widget("l_deadtime"),_("Dead
Time:"),"www.linux-ha.org")
- make_label_active(self.glade.get_widget("l_initdead"),_("Intial
Dead Time:"),"www.linux-ha.org")
+
make_label_active(self.glade.get_widget("l_initdead"),_("Initial Dead
Time:"),"www.linux-ha.org")
make_label_active(self.glade.get_widget("l_transtimeout"),_("Transition
Timeout:"),"www.linux-ha.org")
make_label_active(self.glade.get_widget("l_rscstickiness"),_("Resource
Stickiness:"),"www.linux-ha.org")
make_label_active(self.glade.get_widget("l_noquorum"),_("No
Quorum Policy:"),"www.linux-ha.org")
-
make_label_active(self.glade.get_widget("l_symmetric"),_("Sysmmetric
Cluster"),"www.linux-ha.org")
+
make_label_active(self.glade.get_widget("l_symmetric"),_("Symmetric
Cluster"),"www.linux-ha.org")
make_label_active(self.glade.get_widget("l_stonith_enabled"),_("Stonith
Enabled"),"www.linux-ha.org")
def __init__(self) :
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 18
********************************************
