From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio M. Di Nitto Date: Fri, 14 Mar 2008 05:22:59 +0100 (CET) Subject: [Cluster-devel] cluster/cman/daemon config.c In-Reply-To: <20080218172542.29554.qmail@sourceware.org> References: <20080218172542.29554.qmail@sourceware.org> Message-ID: List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Was this commit really ment to go to CVS? Fabio On Mon, 18 Feb 2008, ccaulfield at sourceware.org wrote: > CVSROOT: /cvs/cluster > Module name: cluster > Changes by: ccaulfield at sourceware.org 2008-02-18 17:25:42 > > Modified files: > cman/daemon : config.c > > Log message: > Allow unnamed parent objects. This fixes a bug where > entries appeared under the top-level rather than the clusternode. > > Patches: > http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/config.c.diff?cvsroot=cluster&r1=1.20&r2=1.21 > > --- cluster/cman/daemon/config.c 2008/01/02 16:35:44 1.20 > +++ cluster/cman/daemon/config.c 2008/02/18 17:25:41 1.21 > @@ -115,6 +115,10 @@ > { > char subpath[1024]; > > + /* Allow for empty parents */ > + if (!object_handle) > + object_handle = parent; > + > /* Found a subkey, iterate through it's sub sections */ > sprintf(subpath, "%s/%s[%d]", key, str, ++count); > if (!read_config_for(ccs_fd, objdb, object_handle, str, subpath, 0)) > -- I'm going to make him an offer he can't refuse.