import fix to ITS#5073

diff --git a/CHANGES b/CHANGES
index bf59e8f59f3337b3eff244d00360be9e62c94731..565468713307275f75081913094ab67c48e585fe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,10 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.38 Engineering
        Fixed slapadd check for ';binary' when required (ITS#5071)
-       Fixed slapd AVA_Sort on multivalued RDNs (ITS#5057)
-       Fixed slapd integer/pointer types and overflow (ITS#5035)
        Fixed slapd select_backend/ManageDSAit (ITS#4986)
+       Fixed slapd integer/pointer types and overflow (ITS#5035)
+       Fixed slapd AVA_Sort on multivalued RDNs (ITS#5057)
+       Fixed slapd syncrepl searchbase scope (ITS#5073)
        Fixed slapd-bdb missing index warning (ITS#5037)
        Fixed slapd-bdb Quick index for ID 0 (ITS#5052)
        Fixed slapd-bdb spurious empty DN warnings during add (ITS#5079)

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 6b743c96dac81a395f63de96dc5631fede6b5724..448e78b3fcd21eb7247f135de8e36638d20c115e 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2892,6 +2892,14 @@ parse_syncrepl_line(
                                Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
                                return -1;
                        }
+                       if ( select_backend( &si->si_base, 0, 0 ) != c->be ) {
+                               ber_memfree( si->si_base.bv_val );
+                               snprintf( c->msg, sizeof( c->msg ),
+                                       "Base DN \"%s\" is not within the database naming context",
+                                       val );
+                               Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
+                               return -1;
+                       }
                        gots |= GOT_BASE;
                } else if ( !strncasecmp( c->argv[ i ], LOGBASESTR "=",
                                        STRLENOF( LOGBASESTR "=" ) ) )