import fix to ITS#3474 from HEAD

diff --git a/CHANGES b/CHANGES
index b7c7863de84be65f7630c215319b721f1d2cdb9e..3322fc6909677f2c660f4d3af9cb55f76c49fbe5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,11 +5,12 @@ OpenLDAP 2.2.21 Engineering
        Fixed slapd/slurpd replog locking (ITS#3421)
        Fixed slaptest failure if databases cannot be started (ITS#3461)
        Fixed back-bdb entry e_ocflags reset on objectClass modify
+       Fixed back-bdb retcode on referral (ITS#3475)
        Fixed back-bdb detecting deadlock in indexer (ITS#3481)
        Build Environment
                Misc fixes for dynamic modules (ITS#3401, #3428)
        Documentation
-               slappasswd man page quotes (ITS#3468)
+               Fixed slappasswd man page quotes (ITS#3468)
 
 OpenLDAP 2.2.20 Release
        Fixed slapd sanity check on protocol in authz-regexp URI (ITS#3411)

diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c
index a77201ba6168be97befb2600ba06965d6bd21ecf..a96706feaaad48fff24e3c7cbca70e4c0d6c8d85 100644 (file)
--- a/servers/slapd/back-bdb/referral.c
+++ b/servers/slapd/back-bdb/referral.c
@@ -116,7 +116,7 @@ dn2entry_retry:
 
                if( rs->sr_ref != NULL ) {
                        /* send referrals */
-                       rs->sr_err = LDAP_REFERRAL;
+                       rc = rs->sr_err = LDAP_REFERRAL;
                        send_ldap_result( op, rs );
                        ber_bvarray_free( rs->sr_ref );
                        rs->sr_ref = NULL;