need this outside for back monitor ...

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 26d853e6b009bb0b29e5b361bd17a2ad50719856..3c5d842059471af4b69bcc38f9ae256e25324d86 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* backend.c - routines for dealing with back-end databases */
@@ -533,9 +533,11 @@ select_backend(
                for ( j = 0; backends[i].be_nsuffix != NULL &&
                    backends[i].be_nsuffix[j] != NULL; j++ )
                {
-                       if ((backends[i].be_glueflags&SLAP_GLUE_SUBORDINATE)&&
-                               noSubs)
+                       if (( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE )
+                               && noSubs )
+                       {
                                continue;
+                       }
 
                        len = backends[i].be_nsuffix[j]->bv_len;
 
@@ -997,7 +999,7 @@ backend_group(
                /* we won't attempt to send it to a different backend */
                
                be = select_backend( gr_ndn, 0,
-                       (be->be_glueflags & SLAP_GLUE_INSTANCE));
+                       (be->be_flags & SLAP_BFLAG_GLUE_INSTANCE));
 
                if (be == NULL) {
                        return LDAP_NO_SUCH_OBJECT;
@@ -1049,7 +1051,7 @@ backend_attribute(
        Entry   *target,
        struct berval   *edn,
        AttributeDescription *entry_at,
-       struct berval ***vals
+       BVarray *vals
 )
 {
        if( target == NULL || target->e_nname.bv_len != edn->bv_len ||
@@ -1058,7 +1060,7 @@ backend_attribute(
                /* we won't attempt to send it to a different backend */
                
                be = select_backend( edn, 0,
-                       (be->be_glueflags & SLAP_GLUE_INSTANCE));
+                       (be->be_flags & SLAP_BFLAG_GLUE_INSTANCE));
 
                if (be == NULL) {
                        return LDAP_NO_SUCH_OBJECT;