From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 14 Nov 2010 23:53:54 +0000 (+0000)
Subject: fix slapo-chain startup issue when using back-config, related to ITS#6540
X-Git-Tag: MIGRATION_CVS2GIT~434
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=001b30ebc61944581e59129b7a3ba9774a1f30cf;p=openldap

fix slapo-chain startup issue when using back-config, related to ITS#6540
---

diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c
index dfd3953260..2334c11052 100644
--- a/servers/slapd/back-ldap/chain.c
+++ b/servers/slapd/back-ldap/chain.c
@@ -1265,6 +1265,7 @@ chain_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
 	assert( rc == LDAP_SUCCESS );
 
 	at = attr_find( e->e_attrs, ad );
+#if 0
 	if ( lc->lc_common_li == NULL && at != NULL ) {
 		/* FIXME: we should generate an empty default entry
 		 * if none is supplied */
@@ -1275,7 +1276,9 @@ chain_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
 		rc = LDAP_CONSTRAINT_VIOLATION;
 		goto done;
 
-	} else if ( lc->lc_common_li != NULL && at == NULL ) {
+	} else
+#endif
+	if ( lc->lc_common_li != NULL && at == NULL ) {
 		/* FIXME: we should generate an empty default entry
 		 * if none is supplied */
 		Debug( LDAP_DEBUG_ANY, "slapd-chain: "