From 9f2ace48a1bbdd30a20e647dcf0f3446363f6620 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 3 Jan 2011 23:30:11 +0000
Subject: [PATCH] ITS#6540
---
CHANGES | 1 +
servers/slapd/back-ldap/chain.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGES b/CHANGES
index aa3b752be7..55277649b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,6 +31,7 @@ OpenLDAP 2.4.24 Engineering
Fixed slapd-ldap debug output of timeout (ITS#6721)
Fixed slapd-ldap DNSSRV referral chaining (ITS#6565)
Fixed slapd-ldap chaining with onelevel scope (ITS#6699)
+ Fixed slapd-ldap chaining with ppolicy (ITS#6540)
Fixed slapd-ldap with SASL/EXTERNAL (ITS#6642)
Fixed slapd-ndb to honor rootpw setting (ITS#6661)
Fixed slapd-meta anon retry with failed auth method (ITS#6643)
diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c
index 9c23dbf9b1..c5f783034b 100644
--- a/servers/slapd/back-ldap/chain.c
+++ b/servers/slapd/back-ldap/chain.c
@@ -1262,6 +1262,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 */
@@ -1272,7 +1273,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: "
--
GitLab