From mboxrd@z Thu Jan 1 00:00:00 1970 From: lhh@sourceware.org Date: 26 Oct 2007 20:22:25 -0000 Subject: [Cluster-devel] cluster/rgmanager/src daemons/main.c utils/clu ... Message-ID: <20071026202225.9982.qmail@sourceware.org> List-Id: 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: RHEL46 Changes by: lhh at sourceware.org 2007-10-26 20:22:25 Modified files: rgmanager/src/daemons: main.c rgmanager/src/utils: clustat.c clusvcadm.c Log message: Fix bugzilla #298861 - apps using magmamsg don't connect from correct source IP on multi-homed hosts Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/main.c.diff?cvsroot=cluster&only_with_tag=RHEL46&r1=1.9.2.22&r2=1.9.2.22.4.1 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clustat.c.diff?cvsroot=cluster&only_with_tag=RHEL46&r1=1.5.2.19&r2=1.5.2.19.4.1 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clusvcadm.c.diff?cvsroot=cluster&only_with_tag=RHEL46&r1=1.2.2.9&r2=1.2.2.9.4.1 --- cluster/rgmanager/src/daemons/main.c 2007/01/04 15:52:41 1.9.2.22 +++ cluster/rgmanager/src/daemons/main.c 2007/10/26 20:22:25 1.9.2.22.4.1 @@ -870,6 +870,7 @@ clu_local_nodeid(NULL, &myNodeID); set_my_id(myNodeID); + msg_set_nodeid(myNodeID); /* Initialize the VF stuff. --- cluster/rgmanager/src/utils/clustat.c 2007/02/06 20:18:48 1.5.2.19 +++ cluster/rgmanager/src/utils/clustat.c 2007/10/26 20:22:25 1.5.2.19.4.1 @@ -637,6 +637,7 @@ /* Grab the local node ID and flag it from the list of reported online nodes */ clu_local_nodeid(NULL, lid); + msg_set_nodeid(*lid); if (!all) return NULL; --- cluster/rgmanager/src/utils/clusvcadm.c 2007/01/04 15:52:41 1.2.2.9 +++ cluster/rgmanager/src/utils/clusvcadm.c 2007/10/26 20:22:25 1.2.2.9.4.1 @@ -324,6 +324,7 @@ membership = clu_member_list(RG_SERVICE_GROUP); msg_update(membership); clu_local_nodeid(RG_SERVICE_GROUP, &me); + msg_set_nodeid(me); if (node_specified) { msgtarget = memb_name_to_id(membership, nodename);