From mboxrd@z Thu Jan  1 00:00:00 1970
From: pcaulfield@sourceware.org <pcaulfield@sourceware.org>
Date: 10 May 2007 09:05:17 -0000
Subject: [Cluster-devel] cluster/cman/daemon ais.c
Message-ID: <20070510090517.25769.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	2007-05-10 09:05:16

Modified files:
	cman/daemon    : ais.c 

Log message:
	Don't override <totem secauth>  if it appears in cluster.conf.
	This allows users to disable encryption if they want.

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

--- cluster/cman/daemon/ais.c	2006/12/18 09:48:11	1.44.2.2
+++ cluster/cman/daemon/ais.c	2007/05/10 09:05:16	1.44.2.3
@@ -515,9 +515,11 @@
 							"none", strlen("none")+1);
 		}
 
-		sprintf(tmp, "%d", 1);
-		objdb->object_key_create(object_handle, "secauth", strlen("secauth"),
-					 tmp, strlen(tmp)+1);
+		if (objdb_get_string(objdb, object_handle, "secauth", &value)) {
+			sprintf(tmp, "%d", 1);
+			objdb->object_key_create(object_handle, "secauth", strlen("secauth"),
+						 tmp, strlen(tmp)+1);
+		}
 
 		if (key_filename)
 		{