[Cluster-devel] cluster/fence/fenced agent.c

[Cluster-devel] cluster/fence/fenced agent.c

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rmccabe at sourceware.org	2007-10-09 22:14:44

Modified files:
	fence/fenced   : agent.c 

Log message:
	Allow valid addresses of nodes even if they're not identical to the way they're specified in cluster.conf

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/agent.c.diff?cvsroot=cluster&r1=1.16&r2=1.17

--- cluster/fence/fenced/agent.c	2007/02/22 16:12:42	1.16
+++ cluster/fence/fenced/agent.c	2007/10/09 22:14:44	1.17
@@ -2,7 +2,7 @@
 *******************************************************************************
 **
 **  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
+**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.
 **
 **  This copyrighted material is made available to anyone wishing to use,
 **  modify, copy, or redistribute it subject to the terms and conditions
@@ -305,8 +305,12 @@
 int dispatch_fence_agent(int cd, char *victim)
 {
 	char *method = NULL, *device = NULL;
+	char *victim_nodename = NULL;
 	int num_methods, num_devices, m, d, error = -1;
 
+	if (ccs_lookup_nodename(cd, victim, &victim_nodename) == 0)
+		victim = victim_nodename;
+
 	num_methods = count_methods(cd, victim);
 
 	for (m = 0; m < num_methods; m++) {
@@ -336,6 +340,8 @@
 
 		if (device)
 			free(device);
+		if (victim_nodename)
+			free(victim_nodename);
 		free(method);
 
 		if (!error)

[Cluster-devel] cluster/fence/fenced agent.c

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rmccabe at sourceware.org	2007-10-26 18:46:16

Modified files:
	fence/fenced   : agent.c 

Log message:
	Fix format string bug

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/agent.c.diff?cvsroot=cluster&r1=1.17&r2=1.18

--- cluster/fence/fenced/agent.c	2007/10/09 22:14:44	1.17
+++ cluster/fence/fenced/agent.c	2007/10/26 18:46:16	1.18
@@ -50,7 +50,7 @@
 		strcat(msg, buf);
 
 		printf("%s\n", msg);
-		syslog(LOG_ERR, msg);
+		syslog(LOG_ERR, "%s", msg);
 
 		memset(buf, 0, sizeof(buf));
 		memset(msg, 0, sizeof(msg));

[Cluster-devel] cluster/fence/fenced agent.c

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-10-26 19:20:43

Modified files:
	fence/fenced   : agent.c 

Log message:
	Fix 354631

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/agent.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.2&r2=1.15.2.3

--- cluster/fence/fenced/agent.c	2007/10/26 18:05:42	1.15.2.2
+++ cluster/fence/fenced/agent.c	2007/10/26 19:20:43	1.15.2.3
@@ -50,7 +50,7 @@
 		strcat(msg, buf);
 
 		printf("%s\n", msg);
-		syslog(LOG_ERR, msg);
+		syslog(LOG_ERR, "%s", msg);
 
 		memset(buf, 0, sizeof(buf));
 		memset(msg, 0, sizeof(msg));