]> git.sur5r.net Git - openldap/commitdiff
ITS#3470 don't propagate error if hasSubordinates fails, it's not that
authorHoward Chu <hyc@openldap.org>
Tue, 11 Jan 2005 00:05:22 +0000 (00:05 +0000)
committerHoward Chu <hyc@openldap.org>
Tue, 11 Jan 2005 00:05:22 +0000 (00:05 +0000)
important.

servers/slapd/back-bdb/operational.c

index 64c7fc72fa69123180c8b2dd299eb398fbbb0d6c..671a67dfff98587b8754fafc08ac577ce4fd3f3a 100644 (file)
@@ -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;
 }