silence warning

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

diff --git a/servers/slapd/back-bdb/operational.c b/servers/slapd/back-bdb/operational.c
index 60249c610bb3479c0df1b59d130dab925d33333e..c239908eac44d5d39e98087464cc72c02f2ee01a 100644 (file)
--- a/servers/slapd/back-bdb/operational.c
+++ b/servers/slapd/back-bdb/operational.c
@@ -1,7 +1,17 @@
 /* operational.c - bdb backend operational attributes function */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -13,7 +23,7 @@
 
 #include "slap.h"
 #include "back-bdb.h"
-#include "proto-bdb.h"
+#include "external.h"
 
 /*
  * sets *hasSubordinates to LDAP_COMPARE_TRUE/LDAP_COMPARE_FALSE
@@ -21,8 +31,6 @@
  */
 int
 bdb_hasSubordinates(
-       BackendDB       *be,
-       Connection      *conn, 
        Operation       *op,
        Entry           *e,
        int             *hasSubordinates )
@@ -30,10 +38,21 @@ bdb_hasSubordinates(
        int             rc;
        
        assert( e );
-       assert( hasSubordinates );
+
+       /* 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:
-       rc = bdb_dn2id_children( be, NULL, &e->e_nname, 0 );
+       /* 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 ) {
        case DB_LOCK_DEADLOCK:
@@ -71,24 +90,20 @@ retry:
  */
 int
 bdb_operational(
-       BackendDB       *be,
-       Connection      *conn, 
        Operation       *op,
-       Entry           *e,
-       AttributeName           *attrs,
+       SlapReply       *rs,
        int             opattrs,
        Attribute       **a )
 {
        Attribute       **aa = a;
-       int             rc = 0;
        
-       assert( e );
+       assert( rs->sr_entry );
 
-       if ( opattrs || ad_inlist( slap_schema.si_ad_hasSubordinates, attrs ) ) {
+       if ( opattrs || ad_inlist( slap_schema.si_ad_hasSubordinates, rs->sr_attrs ) ) {
                int     hasSubordinates;
 
-               rc = bdb_hasSubordinates( be, conn, op, e, &hasSubordinates );
-               if ( rc == LDAP_SUCCESS ) {
+               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;
@@ -96,6 +111,6 @@ bdb_operational(
                }
        }
 
-       return rc;
+       return rs->sr_err;
 }