From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 8 Aug 2007 18:26:00 +0000 (+0000)
Subject: import fix to ITS#5073
X-Git-Tag: OPENLDAP_REL_ENG_2_3_38~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9220b80e0d9034487521b733cc66cf03c84e4ac8;p=openldap

import fix to ITS#5073
---

diff --git a/CHANGES b/CHANGES
index bf59e8f59f..5654687133 100644
--- 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 6b743c96da..448e78b3fc 100644
--- 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 "=" ) ) )