Alias/Referral bug fix

diff --git a/CHANGES b/CHANGES
index 2b2053a3b35664963aa2c6166553b56659808308..dc3f969321180da5b47353417f5e24a224d046b9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.1.9 Engineering
        Fixed libldap try_read1msg drain bug (ITS#2153)
        Fixed slapd unix socket unlink bug (ITS#2157)
        Fixed slapd empty SASL cred bug
+       Fixed slapd referral/alias normalization bug
        Added "allow update_anon" feature (ITS#2155)
        Build Environment
                Add subordinate referral test

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 5d2bdcec14855ac86a36ebeafd93ddb23f50d006..3ecc66bb922c72007aeeaeef8949960d65169c5a 100644 (file)
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -941,7 +941,7 @@ static int search_candidates(
         */
        if (!oc_filter(filter, 1, &depth) && !get_subentries_visibility(op) ) {
                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_ava = &aa_ref;
                        rf.f_av_desc = slap_schema.si_ad_objectClass;
@@ -952,7 +952,7 @@ static int search_candidates(
 
 #ifdef BDB_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_ava = &aa_alias;
                        af.f_av_desc = slap_schema.si_ad_objectClass;

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 1d41140078e5d8ea107e6be99b22680834de4890..875b6e99f695208aeb9c87e1d51e686ca6fd0a6e 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -554,8 +554,8 @@ search_candidates(
        ID_BLOCK                *candidates;
        Filter          f, fand, rf, af, xf;
     AttributeAssertion aa_ref, aa_alias;
-       struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
-       struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" };
+       struct berval bv_ref = { sizeof("referral")-1, "referral" };
+       struct berval bv_alias = { sizeof("alias")-1, "alias" };
 
 #ifdef NEW_LOGGING
        LDAP_LOG( BACK_LDBM, DETAIL1,