Attachment 154984 Details for Bug 240508 – Patch to fix

[patch] Patch to fix

cman2.patch (text/plain), 1.33 KB, created by Christine Caulfield on 2007-05-18 09:54:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2007-05-18 09:54:51 UTC

Size: 1.33 KB

patch

obsolete

>Index: cmanccs.c
>===================================================================
>RCS file: /cvs/cluster/cluster/cman/daemon/cmanccs.c,v
>retrieving revision 1.26
>diff -u -p -r1.26 cmanccs.c
>--- cmanccs.c	15 Mar 2007 11:12:33 -0000	1.26
>+++ cmanccs.c	18 May 2007 09:49:27 -0000
>@@ -61,7 +61,7 @@ static char *nodenames[MAX_NODENAMES];
> static int  portnums[MAX_NODENAMES];
> static char *mcast[MAX_NODENAMES];
> static int num_nodenames;
>-static int two_node;
>+       int two_node;
>        char *key_filename;
> static char *mcast_name;
> static unsigned char votes;
>@@ -123,6 +123,8 @@ int read_ccs_nodes(unsigned int *config_
> 	    two_node = atoi(str);
> 	    free(str);
>     }
>+    else
>+	two_node = 0;
> 
>     for (i=1;;i++) {
> 	char nodekey[256];
>Index: commands.c
>===================================================================
>RCS file: /cvs/cluster/cluster/cman/daemon/commands.c,v
>retrieving revision 1.61
>diff -u -p -r1.61 commands.c
>--- commands.c	17 Jan 2007 15:02:49 -0000	1.61
>+++ commands.c	18 May 2007 09:49:28 -0000
>@@ -61,7 +61,7 @@ static LIST_INIT(cluster_members_list);
>        unsigned int config_version;
> static struct cluster_node *us;
> static int quorum;
>-static int two_node;
>+extern int two_node;
>        unsigned int quorumdev_poll=10000;
>        unsigned int shutdown_timeout=5000;
>        unsigned int ccsd_poll_interval=1000;

Actions: View | Diff

Attachments on bug 240508: 154966 | 154984