From mboxrd@z Thu Jan  1 00:00:00 1970
From: pcaulfield@sourceware.org <pcaulfield@sourceware.org>
Date: 13 Dec 2007 13:39:59 -0000
Subject: [Cluster-devel] cluster/cman/daemon ais.c
Message-ID: <20071213133959.21595.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
Changes by:	pcaulfield at sourceware.org	2007-12-13 13:39:58

Modified files:
	cman/daemon    : ais.c 

Log message:
	Allow rrp_mode to be overridden in cluster.conf

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.55&r2=1.56

--- cluster/cman/daemon/ais.c	2007/11/29 11:19:12	1.55
+++ cluster/cman/daemon/ais.c	2007/12/13 13:39:58	1.56
@@ -518,13 +518,15 @@
 
 
 		/* Set RRP mode appropriately */
-		if (num_interfaces > 1) {
-			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
-							"active", strlen("active")+1);
-		}
-		else {
-			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
-							"none", strlen("none")+1);
+		if (objdb_get_string(objdb, object_handle, "rrp_mode", &value)) {
+			if (num_interfaces > 1) {
+				global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
+								"active", strlen("active")+1);
+			}
+			else {
+				global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
+								"none", strlen("none")+1);
+			}
 		}
 
 		if (objdb_get_string(objdb, object_handle, "secauth", &value)) {