mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-24 13:24:56 +08:00
Fix referrals and alias. For ldbm and I think for bdb, this is necessary
now that we normalize to lower case. Should be merged into 2.1.
This commit is contained in:
parent
b9e442d7de
commit
0f86bbde87
@ -941,7 +941,7 @@ static int search_candidates(
|
|||||||
*/
|
*/
|
||||||
if (!oc_filter(filter, 1, &depth) && !get_subentries_visibility(op) ) {
|
if (!oc_filter(filter, 1, &depth) && !get_subentries_visibility(op) ) {
|
||||||
if( !get_manageDSAit(op) ) { /* match referrals */
|
if( !get_manageDSAit(op) ) { /* match referrals */
|
||||||
struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
|
struct berval bv_ref = { sizeof("referral")-1, "referral" };
|
||||||
rf.f_choice = LDAP_FILTER_EQUALITY;
|
rf.f_choice = LDAP_FILTER_EQUALITY;
|
||||||
rf.f_ava = &aa_ref;
|
rf.f_ava = &aa_ref;
|
||||||
rf.f_av_desc = slap_schema.si_ad_objectClass;
|
rf.f_av_desc = slap_schema.si_ad_objectClass;
|
||||||
@ -952,7 +952,7 @@ static int search_candidates(
|
|||||||
|
|
||||||
#ifdef BDB_ALIASES
|
#ifdef BDB_ALIASES
|
||||||
if( deref & LDAP_DEREF_SEARCHING ) { /* match aliases */
|
if( deref & LDAP_DEREF_SEARCHING ) { /* match aliases */
|
||||||
struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" };
|
struct berval bv_alias = { sizeof("alias")-1, "alias" };
|
||||||
af.f_choice = LDAP_FILTER_EQUALITY;
|
af.f_choice = LDAP_FILTER_EQUALITY;
|
||||||
af.f_ava = &aa_alias;
|
af.f_ava = &aa_alias;
|
||||||
af.f_av_desc = slap_schema.si_ad_objectClass;
|
af.f_av_desc = slap_schema.si_ad_objectClass;
|
||||||
|
@ -554,8 +554,8 @@ search_candidates(
|
|||||||
ID_BLOCK *candidates;
|
ID_BLOCK *candidates;
|
||||||
Filter f, fand, rf, af, xf;
|
Filter f, fand, rf, af, xf;
|
||||||
AttributeAssertion aa_ref, aa_alias;
|
AttributeAssertion aa_ref, aa_alias;
|
||||||
struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
|
struct berval bv_ref = { sizeof("referral")-1, "referral" };
|
||||||
struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" };
|
struct berval bv_alias = { sizeof("alias")-1, "alias" };
|
||||||
|
|
||||||
#ifdef NEW_LOGGING
|
#ifdef NEW_LOGGING
|
||||||
LDAP_LOG( BACK_LDBM, DETAIL1,
|
LDAP_LOG( BACK_LDBM, DETAIL1,
|
||||||
|
Loading…
Reference in New Issue
Block a user