From mboxrd@z Thu Jan  1 00:00:00 1970
From: pcaulfield@sourceware.org <pcaulfield@sourceware.org>
Date: 31 Oct 2006 09:28:14 -0000
Subject: [Cluster-devel] cluster/cman/daemon ais.c
Message-ID: <20061031092814.14680.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	2006-10-31 09:28:13

Modified files:
	cman/daemon    : ais.c 

Log message:
	Set the default token timeout to 5 seconds. It can still be overridden
	in cluster.conf if required.

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

--- cluster/cman/daemon/ais.c	2006/10/05 07:48:33	1.42
+++ cluster/cman/daemon/ais.c	2006/10/31 09:28:12	1.43
@@ -470,6 +470,8 @@
 			       "totem", strlen("totem"),
 			       &object_handle) == 0)
 	{
+		void *value = NULL;
+
 		objdb->object_key_create(object_handle, "version", strlen("version"),
 					 "2", 2);
 
@@ -480,6 +482,13 @@
 		objdb->object_key_create(object_handle, "vsftype", strlen("vsftype"),
 					 "none", strlen("none")+1);
 
+		/* Set the token timeout is 5 seconds, but don't overrride anything that
+		   might be in cluster.conf */
+		if (objdb->object_key_get(object_handle, "token", strlen("token"), &value, NULL) || value == NULL) {
+			global_objdb->object_key_create(object_handle, "token", strlen("token"),
+							"5000", strlen("5000")+1);
+		}
+
 		/* Set RRP mode appropriately */
 		if (num_interfaces > 1) {
 			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),