From: Howard Chu <hyc@openldap.org>
Date: Tue, 11 Jan 2005 00:05:22 +0000 (+0000)
Subject: ITS#3470 don't propagate error if hasSubordinates fails, it's not that
X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~438
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d140433c9f33425d8bcdbc3b0a2262173bbc49ef;p=openldap

ITS#3470 don't propagate error if hasSubordinates fails, it's not that
important.
---

diff --git a/servers/slapd/back-bdb/operational.c b/servers/slapd/back-bdb/operational.c
index 64c7fc72fa..671a67dfff 100644
--- a/servers/slapd/back-bdb/operational.c
+++ b/servers/slapd/back-bdb/operational.c
@@ -97,10 +97,10 @@ bdb_operational(
 	if ( SLAP_OPATTRS( rs->sr_attr_flags ) ||
 			ad_inlist( slap_schema.si_ad_hasSubordinates, rs->sr_attrs ) )
 	{
-		int	hasSubordinates;
+		int	hasSubordinates, rc;
 
-		rs->sr_err = bdb_hasSubordinates( op, rs->sr_entry, &hasSubordinates );
-		if ( rs->sr_err == LDAP_SUCCESS ) {
+		rc = bdb_hasSubordinates( op, rs->sr_entry, &hasSubordinates );
+		if ( rc == LDAP_SUCCESS ) {
 			*ap = slap_operational_hasSubordinate( hasSubordinates == LDAP_COMPARE_TRUE );
 			assert( *ap );
 
@@ -108,6 +108,6 @@ bdb_operational(
 		}
 	}
 
-	return rs->sr_err;
+	return LDAP_SUCCESS;
 }