From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 12 Jan 2005 18:53:31 +0000 (+0000)
Subject: import fix to ITS#3474 from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_21~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=959e9e67c4fa3108c8eac3eb7545c7c95cb1ced4;p=openldap

import fix to ITS#3474 from HEAD
---

diff --git a/CHANGES b/CHANGES
index b7c7863de8..3322fc6909 100644
--- 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 a77201ba61..a96706feaa 100644
--- 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;