From mboxrd@z Thu Jan  1 00:00:00 1970
From: pcaulfield@sourceware.org <pcaulfield@sourceware.org>
Date: 2 Jan 2008 10:56:22 -0000
Subject: [Cluster-devel] cluster/cman/daemon Makefile ais.c
Message-ID: <20080102105622.2457.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	pcaulfield at sourceware.org	2008-01-02 10:56:21

Modified files:
	cman/daemon    : Makefile ais.c 

Log message:
	Errorstring fixes from Fabio.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.47.2.1&r2=1.47.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.44.2.3&r2=1.44.2.4

--- cluster/cman/daemon/Makefile	2007/06/26 12:29:17	1.47.2.1
+++ cluster/cman/daemon/Makefile	2008/01/02 10:56:21	1.47.2.2
@@ -15,7 +15,7 @@
 
 include ${top_srcdir}/make/defines.mk
 
-CFLAGS+= -fPIC -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
+CFLAGS+= -I/home/christine/dev/openais-installed/usr/include -fPIC -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
 	-DCMAN_RELEASE_NAME=\"${RELEASE}\" -DOPENAIS_EXTERNAL_SERVICE
 
 ifeq ($(DEBUG),y)
--- cluster/cman/daemon/ais.c	2007/05/10 09:05:16	1.44.2.3
+++ cluster/cman/daemon/ais.c	2008/01/02 10:56:21	1.44.2.4
@@ -29,6 +29,7 @@
 
 /* openais headers */
 #include <openais/totem/totemip.h>
+//#include <openais/service/objdb.h>
 #include <openais/totem/totempg.h>
 #include <openais/totem/aispoll.h>
 #include <openais/service/service.h>
@@ -60,7 +61,6 @@
 int num_ais_nodes;
 
 static int config_run;
-static char errorstring[512];
 static int startup_pipe;
 static unsigned int debug_mask;
 static int first_trans = 1;
@@ -225,7 +225,7 @@
 	if (error)
 	{
 		write_cman_pipe("Error reading config from CCS");
-		sprintf(errorstring, "Error reading config from CCS");
+		*error_string = "Error reading config from CCS";
 		return -1;
 	}
 
@@ -234,6 +234,8 @@
 
 	config_run = 1;
 
+	*error_string = "Successfully read configuration from CCS";
+
 	return 0;
 }