Multi-threaded slapindex

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 25e009e1ca56b1ba65d329f216c2770617fc47db..77dcf4a422b7eb562738fb6e564b50a26b8820da 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -477,7 +477,9 @@ int backend_destroy(void)
                }
                acl_destroy( bd->be_acl, frontendDB->be_acl );
 
-               assert( bd->be_replogfile == NULL );
+               if ( bd->be_replogfile != NULL ) {
+                       free( bd->be_replogfile );
+               }
                assert( bd->be_replica == NULL );
        }
 
@@ -612,7 +614,13 @@ select_backend(
                                                continue;
                                        }
                                } else {
-                                       b2 = be;
+                                       /* If any parts of the tree are glued, use the first
+                                        * match regardless of manageDSAit. Otherwise use the
+                                        * last match.
+                                        */
+                                       if( !( SLAP_DBFLAGS( be ) & ( SLAP_DBFLAG_GLUE_INSTANCE |
+                                               SLAP_DBFLAG_GLUE_SUBORDINATE )))
+                                               b2 = be;
                                }
                                return b2;
                        }