upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-01 04:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Pierangelo Masarati 2005-08-18 11:26:29 +00:00
parent 27267f0f78
commit 11211d0dae
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/back-ldap/search.c
View file

@ -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] */ );

8
servers/slapd/back-meta/search.c
View file

@ -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] */ );