Fixup bdb_entry_release now that entry_decode uses two memory blocks

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index f1216f410a3f9bc576d55482cc892a566cd7c3c9..85ce0983744751b6114445373d94cdaa05739039 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -525,7 +525,7 @@ select_backend(
                        }
 
                        
-                       if ( len && len < dnlen && !DN_SEPARATOR( dn[(dnlen-len)-1] ) ) {
+                       if ( len && len < dnlen && ( !DN_SEPARATOR( dn[(dnlen-len)-1] ) || DN_ESCAPE( dn[(dnlen-len)-2] ) ) ) {
                                /* make sure we have a separator */
                                continue;
                        }
@@ -584,6 +584,24 @@ be_isroot( Backend *be, const char *ndn )
        return(rc);
 }
 
+int
+be_isupdate( Backend *be, const char *ndn )
+{
+       int rc;
+
+       if ( ndn == NULL || *ndn == '\0' ) {
+               return( 0 );
+       }
+
+       if ( be->be_update_ndn == NULL || *be->be_update_ndn == '\0' ) {
+               return( 0 );
+       }
+
+       rc = strcmp( be->be_update_ndn, ndn ) ? 0 : 1;
+
+       return(rc);
+}
+
 char *
 be_root_dn( Backend *be )
 {
@@ -963,6 +981,16 @@ backend_group(
        if (i)
                return SLAPD_ABANDON;
 
+       if( strcmp( target->e_ndn, gr_ndn ) != 0 ) {
+               /* we won't attempt to send it to a different backend */
+               
+               be = select_backend(gr_ndn, 0);
+
+               if (be == NULL) {
+                       return LDAP_NO_SUCH_OBJECT;
+               }
+       } 
+
        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
        for (g = conn->c_groups; g; g=g->next) {
                if (g->be != be || g->oc != group_oc || g->at != group_at ||
@@ -975,16 +1003,6 @@ backend_group(
        if (g)
                return g->res;
 
-       if( strcmp( target->e_ndn, gr_ndn ) != 0 ) {
-               /* we won't attempt to send it to a different backend */
-               
-               be = select_backend(gr_ndn, 0);
-
-               if (be == NULL) {
-                       return LDAP_NO_SUCH_OBJECT;
-               }
-       } 
-
        if( be->be_group ) {
                int res = be->be_group( be, conn, op,
                        target, gr_ndn, op_ndn,