Move MSVC port to the Attic

[openldap] / servers / slapd / back-bdb / operational.c

diff --git a/servers/slapd/back-bdb/operational.c b/servers/slapd/back-bdb/operational.c
index c239908eac44d5d39e98087464cc72c02f2ee01a..3ff7aa2bc97bfb2cee412057afb6ab0c9f1ca2fe 100644 (file)
--- a/servers/slapd/back-bdb/operational.c
+++ b/servers/slapd/back-bdb/operational.c
@@ -91,23 +91,26 @@ retry:
 int
 bdb_operational(
        Operation       *op,
-       SlapReply       *rs,
-       int             opattrs,
-       Attribute       **a )
+       SlapReply       *rs )
 {
-       Attribute       **aa = a;
-       
+       Attribute       **ap;
+
        assert( rs->sr_entry );
 
-       if ( opattrs || ad_inlist( slap_schema.si_ad_hasSubordinates, rs->sr_attrs ) ) {
+       for ( ap = &rs->sr_operational_attrs; *ap; ap = &(*ap)->a_next )
+               /* just count */ ;
+
+       if ( SLAP_OPATTRS( rs->sr_attr_flags ) ||
+                       ad_inlist( slap_schema.si_ad_hasSubordinates, rs->sr_attrs ) )
+       {
                int     hasSubordinates;
 
                rs->sr_err = bdb_hasSubordinates( op, rs->sr_entry, &hasSubordinates );
                if ( rs->sr_err == LDAP_SUCCESS ) {
-                       *aa = slap_operational_hasSubordinate( hasSubordinates == LDAP_COMPARE_TRUE );
-                       if ( *aa != NULL ) {
-                               aa = &(*aa)->a_next;
-                       }
+                       *ap = slap_operational_hasSubordinate( hasSubordinates == LDAP_COMPARE_TRUE );
+                       assert( *ap );
+
+                       ap = &(*ap)->a_next;
                }
        }