cluster: STABLE3 - config: in LDAP cluster entry is not a cn=

Fabio M. Di Nitto fabbione at fedoraproject.org
Mon Oct 5 03:47:02 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1f6dfba4f8901d3f7c324281696b2ed58cb083ed
Commit:        1f6dfba4f8901d3f7c324281696b2ed58cb083ed
Parent:        3f88e836e582c63938d2fd3862080a8e920a6f52
Author:        Christine Caulfield <ccaulfie at redhat.com>
AuthorDate:    Mon Sep 14 14:59:48 2009 +0100
Committer:     Christine Caulfield <ccaulfie at redhat.com>
CommitterDate: Mon Sep 14 14:59:48 2009 +0100

config: in LDAP cluster entry is not a cn=

cn=cluster should be name=cluster. This gets rid of a
schema anomoly.

Signed-off-by: Christine Caulfield <ccaulfie at redhat.com>
---
 config/plugins/ldap/configldap.c |    2 +-
 config/tools/ldap/confdb2ldif.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/plugins/ldap/configldap.c b/config/plugins/ldap/configldap.c
index c4549ae..c3e8b4c 100644
--- a/config/plugins/ldap/configldap.c
+++ b/config/plugins/ldap/configldap.c
@@ -282,7 +282,7 @@ static int init_config(struct objdb_iface_ver0 *objdb)
 		return -1;
 	}
 
-	rc = read_config_for(ld, objdb, OBJECT_PARENT_HANDLE, "cluster", "cn=cluster", 1);
+	rc = read_config_for(ld, objdb, OBJECT_PARENT_HANDLE, "cluster", "name=cluster", 1);
 
 	ldap_unbind(ld);
 	return 0;
diff --git a/config/tools/ldap/confdb2ldif.c b/config/tools/ldap/confdb2ldif.c
index f75a5b3..35f8c31 100644
--- a/config/tools/ldap/confdb2ldif.c
+++ b/config/tools/ldap/confdb2ldif.c
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
 		exit (1);
 	}
 
-	sprintf(basedn, "cn=%s,%s", clusterroot, argv[1]);
+	sprintf(basedn, "name=%s,%s", clusterroot, argv[1]);
 
 	/* Print a header */
 	printf("# This file was generated by confdb2ldif, from an existing cluster configuration\n");


More information about the cluster-commits mailing list