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 d7f7a586f05e5cdd29fc925f48c0a7dbd995468f..3ff7aa2bc97bfb2cee412057afb6ab0c9f1ca2fe 100644 (file)
--- a/servers/slapd/back-bdb/operational.c
+++ b/servers/slapd/back-bdb/operational.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2003 The OpenLDAP Foundation.
+ * Copyright 2000-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,19 @@ bdb_hasSubordinates(
        
        assert( e );
 
+       /* NOTE: this should never happen, but it actually happens
+        * when using back-relay; until we find a better way to
+        * preserve entry's private information while rewriting it,
+        * let's disable the hasSubordinate feature for back-relay.
+        */
+       if ( BEI( e ) == NULL ) {
+               return LDAP_OTHER;
+       }
+
 retry:
+       /* FIXME: we can no longer assume the entry's e_private
+        * field is correctly populated; so we need to reacquire
+        * it with reader lock */
        rc = bdb_cache_children( op, NULL, e );
        
        switch( rc ) {
@@ -79,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;
                }
        }