From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 18 Aug 2005 11:26:29 +0000 (+0000)
Subject: strip entryDN from search entries; frontend will reattach it :(
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~666
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=11211d0dae45606f6a2f58aa4b5713994dd357ab;p=openldap

strip entryDN from search entries; frontend will reattach it :(
---

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index ff9425bb57..e06cb8bb42 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -545,7 +545,9 @@ ldap_build_entry(
 		}
 
 		/* no subschemaSubentry */
-		if ( attr->a_desc == slap_schema.si_ad_subschemaSubentry ) {
+		if ( attr->a_desc == slap_schema.si_ad_subschemaSubentry
+			|| attr->a_desc == slap_schema.si_ad_entryDN )
+		{
 
 			/* 
 			 * We eat target's subschemaSubentry because
@@ -553,6 +555,10 @@ ldap_build_entry(
 			 * to resolve to the appropriate backend;
 			 * later, the local subschemaSubentry is
 			 * added.
+			 *
+			 * We also eat entryDN because the frontend
+			 * will reattach it without checking if already
+			 * present...
 			 */
 			( void )ber_scanf( &ber, "x" /* [W] */ );
 
diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 8437cea8e8..570d9deb5f 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -924,7 +924,9 @@ meta_send_entry(
 		}
 
 		/* no subschemaSubentry */
-		if ( attr->a_desc == slap_schema.si_ad_subschemaSubentry ) {
+		if ( attr->a_desc == slap_schema.si_ad_subschemaSubentry
+			|| attr->a_desc == slap_schema.si_ad_entryDN )
+		{
 
 			/* 
 			 * We eat target's subschemaSubentry because
@@ -932,6 +934,10 @@ meta_send_entry(
 			 * to resolve to the appropriate backend;
 			 * later, the local subschemaSubentry is
 			 * added.
+			 *
+			 * We also eat entryDN because the frontend
+			 * will reattach it without checking if already
+			 * present...
 			 */
 			( void )ber_scanf( &ber, "x" /* [W] */ );