This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: master - config: compile with latest corosync handle changes
- From: Christine Caulfield <chrissie at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 25 Feb 2009 14:09:57 +0000 (UTC)
- Subject: cluster: master - config: compile with latest corosync handle changes
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c03e500f89bb197ce5c67089ef6c9c7ff1142e0b
Commit: c03e500f89bb197ce5c67089ef6c9c7ff1142e0b
Parent: f4c6d690d77929c313fb0562f7b2f9da75b720e6
Author: Christine Caulfield <ccaulfie@redhat.com>
AuthorDate: Wed Feb 25 14:09:31 2009 +0000
Committer: Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Wed Feb 25 14:09:31 2009 +0000
config: compile with latest corosync handle changes
Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
config/plugins/ldap/configldap.c | 14 +++++++-------
config/plugins/xml/config.c | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/config/plugins/ldap/configldap.c b/config/plugins/ldap/configldap.c
index 11a5250..aab8934 100644
--- a/config/plugins/ldap/configldap.c
+++ b/config/plugins/ldap/configldap.c
@@ -99,14 +99,14 @@ static void convert_dn_underscores(LDAPDN dn)
* Return the parent object of a DN.
* Actually, this returns the LAST parent with that name. which should (!) be correct.
*/
-static unsigned int find_parent(struct objdb_iface_ver0 *objdb, LDAPDN dn, int startdn, char *parent)
+static hdb_handle_t find_parent(struct objdb_iface_ver0 *objdb, LDAPDN dn, int startdn, char *parent)
{
int i=startdn;
int gotstart=0;
int start=0, end=startdn;
- unsigned int parent_handle = OBJECT_PARENT_HANDLE;
- unsigned int object_handle=0;
- unsigned int find_handle;
+ hdb_handle_t parent_handle = OBJECT_PARENT_HANDLE;
+ hdb_handle_t object_handle=0;
+ hdb_handle_t find_handle;
/*
* Find the start and end positions first.
@@ -138,15 +138,15 @@ static unsigned int find_parent(struct objdb_iface_ver0 *objdb, LDAPDN dn, int s
-static int read_config_for(LDAP *ld, struct objdb_iface_ver0 *objdb, unsigned int parent,
+static int read_config_for(LDAP *ld, struct objdb_iface_ver0 *objdb, hdb_handle_t parent,
char *object, char *sub_dn, int always_create)
{
char search_dn[4096];
int rc;
char *dn;
LDAPMessage *result, *e;
- unsigned int parent_handle = OBJECT_PARENT_HANDLE;
- unsigned int object_handle;
+ hdb_handle_t parent_handle = OBJECT_PARENT_HANDLE;
+ hdb_handle_t object_handle;
sprintf(search_dn, "%s,%s", sub_dn, ldap_basedn);
diff --git a/config/plugins/xml/config.c b/config/plugins/xml/config.c
index 6889acf..cff632e 100644
--- a/config/plugins/xml/config.c
+++ b/config/plugins/xml/config.c
@@ -52,7 +52,7 @@ static void xml_comp_register(void)
};
static void addkeys(xmlAttrPtr tmpattr, struct objdb_iface_ver0 *objdb,
- unsigned int object_handle)
+ hdb_handle_t object_handle)
{
for (tmpattr = tmpattr; tmpattr; tmpattr = tmpattr->next) {
if (tmpattr->type == XML_ATTRIBUTE_NODE)
@@ -67,9 +67,9 @@ static void addkeys(xmlAttrPtr tmpattr, struct objdb_iface_ver0 *objdb,
}
static void xml2objdb(xmlNodePtr tmpnode, struct objdb_iface_ver0 *objdb,
- unsigned int parent)
+ hdb_handle_t parent)
{
- unsigned int object_handle = 0;
+ hdb_handle_t object_handle = 0;
for (tmpnode = tmpnode; tmpnode; tmpnode = tmpnode->next) {
if (tmpnode->type == XML_ELEMENT_NODE) {