don't add the trailing '??base' to URIs

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 9682b2d7af54245b1e87516301675f303b9f8874..28b057ed01e14bebfef21581c42609dac8d4dede 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -172,7 +172,8 @@ meta_back_db_config(
 
                ludp->lud_dn[ 0 ] = '\0';
 
-               for ( tmpludp = ludp->lud_next; tmpludp; tmpludp = tmpludp->lud_next ) {
+               /* check all, to apply the scope check on the first one */
+               for ( tmpludp = ludp; tmpludp; tmpludp = tmpludp->lud_next ) {
                        if ( tmpludp->lud_dn != NULL && tmpludp->lud_dn[ 0 ] != '\0' ) {
                                fprintf( stderr, "%s: line %d: "
                                                "multiple URIs must have "
@@ -181,6 +182,10 @@ meta_back_db_config(
                                return( 1 );
 
                        }
+
+                       if ( tmpludp->lud_scope == LDAP_SCOPE_BASE ) {
+                               tmpludp->lud_scope = LDAP_SCOPE_DEFAULT;
+                       }
                }
 
                li->targets[ i ]->mt_uri = ldap_url_list2urls( ludp );