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: crm by andrew from
([email protected])
3. Linux-HA CVS: linux-ha by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 17 May 2006 02:29: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:
main.c
Log Message:
Coverity: Use of uninitialized data
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/main.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- main.c 10 Apr 2006 16:18:08 -0000 1.42
+++ main.c 17 May 2006 08:29:27 -0000 1.43
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.42 2006/04/10 16:18:08 andrew Exp $ */
+/* $Id: main.c,v 1.43 2006/05/17 08:29:27 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -295,10 +295,12 @@
}
}
- crm_debug_3("CCM Activation passed... all set to go!");
- G_main_add_fd(G_PRIORITY_HIGH, cib_ev_fd, FALSE,
- cib_ccm_dispatch, cib_ev_token,
- default_ipc_connection_destroy);
+ if(was_error == FALSE) {
+ crm_debug_3("CCM Activation passed... all set to go!");
+ G_main_add_fd(G_PRIORITY_HIGH, cib_ev_fd, FALSE,
+ cib_ccm_dispatch, cib_ev_token,
+ default_ipc_connection_destroy);
+ }
}
if(was_error == FALSE) {
------------------------------
Message: 2
Date: Wed, 17 May 2006 02:30:29 -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_attribute.c
Log Message:
Coverity: dereference of NULL pointer
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_attribute.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- crm_attribute.c 8 May 2006 07:30:42 -0000 1.14
+++ crm_attribute.c 17 May 2006 08:30:28 -0000 1.15
@@ -1,4 +1,4 @@
-/* $Id: crm_attribute.c,v 1.14 2006/05/08 07:30:42 andrew Exp $ */
+/* $Id: crm_attribute.c,v 1.15 2006/05/17 08:30:28 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -233,19 +233,14 @@
if(safe_str_eq(crm_system_name, "crm_master")) {
int len = 0;
- char *rsc = NULL;
-
if(safe_str_eq(type, "reboot")) {
type = XML_CIB_TAG_STATUS;
} else {
type = XML_CIB_TAG_NODES;
}
- rsc = getenv("OCF_RESOURCE_INSTANCE");
-
- CRM_DEV_ASSERT(rsc != NULL);
- CRM_DEV_ASSERT(dest_node != NULL);
+ rsc_id = getenv("OCF_RESOURCE_INSTANCE");
- if(rsc == NULL && dest_node == NULL) {
+ if(rsc_id == NULL && dest_node == NULL) {
fprintf(stderr, "This program should only ever be "
"invoked from inside an OCF resource agent.\n");
fprintf(stderr, "DO NOT INVOKE MANUALLY FROM THE
COMMAND LINE.\n");
@@ -254,11 +249,15 @@
} else if(dest_node == NULL) {
fprintf(stderr, "Could not determin node UUID.\n");
return 1;
+
+ } else if(rsc_id == NULL) {
+ fprintf(stderr, "Could not determin resource name.\n");
+ return 1;
}
- len = 8 + strlen(rsc);
+ len = 8 + strlen(rsc_id);
crm_malloc0(attr_name, len);
- sprintf(attr_name, "master-%s", rsc);
+ sprintf(attr_name, "master-%s", rsc_id);
len = 2 + strlen(attr_name) + strlen(dest_node);
crm_malloc0(attr_id, len);
------------------------------
Message: 3
Date: Wed, 17 May 2006 02:34:56 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
ConfigureMe
Log Message:
Get rid of the universal binary stuff
Support both Fink and DarwinPorts environments
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ConfigureMe,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- ConfigureMe 11 May 2006 18:40:18 -0000 1.52
+++ ConfigureMe 17 May 2006 08:34:55 -0000 1.53
@@ -131,34 +131,21 @@
}
ConfigureDarwin() {
- FLAGS="--prefix=/sw --sysconfdir=/sw/etc --localstatedir=/sw/var"
+
+ for dir in /sw /opt/local; do
+ if [ -d $dir ]; then
+ install_prefix=$dir
+ fi
+ done
+
+ FLAGS="--prefix=${install_prefix}"
FLAGS="$FLAGS --with-initdir=/private/etc/mach_init.d"
FLAGS="$FLAGS --with-group-id=65 --with-ccmuser-id=65"
FLAGS="$FLAGS --enable-fatal-warnings=yes"
- FLAGS="$FLAGS --disable-ldirectord"
export CFENV="Darwin"
-# For building universal binaries
-# http://developer.apple.com/technotes/tn2005/tn2137.html
-#
-# latest_SDK should be MacOSX10.4u.sdk or later
-
- export latest_SDK=`ls -1tr /Developer/SDKs | tail -n 1`
- export SDK_ROOT=/Developer/SDKs/$latest_SDK
- FLAGS="$FLAGS --disable-dependency-tracking"
- CPPFLAGS="$CPPFLAGS -isysroot $SDK_ROOT"
-
-# Need to make sure all dependancy libs are universal before this can
-# be enabled (but thats a pain so it wont happen in a hurry)
-# CPPFLAGS="$CPPFLAGS -arch ppc -arch i386"
-
-# export LDFLAGS="$LDFLAGS -Wl,-syslibroot,$SDK_ROOT"
-# only works on 32-bit platforms but this seems to be equivilent:
-# export LIBS="-L$SDK_ROOT/usr/lib -L/sw/lib $LIBS"
-
- export LIBS="-L$SDK_ROOT/usr/lib $LIBS -L/sw/lib"
- CPPFLAGS="$CPPFLAGS -g -I$SDK_ROOT/usr/include"
- CPPFLAGS="$CPPFLAGS -I/sw/usr/include -I/sw/include"
+ export LIBS="$LIBS -L${install_prefix}/lib"
+ CPPFLAGS="$CPPFLAGS -g -I${install_prefix}/include"
export CPPFLAGS
}
------------------------------
Message: 4
Date: Wed, 17 May 2006 02:53: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/admin
Modified Files:
crm_attribute.c
Log Message:
Nice log message to keep provo happy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_attribute.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- crm_attribute.c 17 May 2006 08:30:28 -0000 1.15
+++ crm_attribute.c 17 May 2006 08:53:17 -0000 1.16
@@ -1,4 +1,4 @@
-/* $Id: crm_attribute.c,v 1.15 2006/05/17 08:30:28 andrew Exp $ */
+/* $Id: crm_attribute.c,v 1.16 2006/05/17 08:53:17 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -291,6 +291,10 @@
the_cib, dest_node, type, attr_value);
} else if(DO_WRITE) {
+ if(attr_value == NULL) {
+ fprintf(stderr, "Please specify 'true' or
'false' with -v\n");
+ return 1;
+ }
rc = set_standby(the_cib, dest_node, type, attr_value);
} else {
------------------------------
_______________________________________________
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 53
********************************************
