From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 9 Jun 2007 16:28:35 +0000 (+0000)
Subject: temporary fix to ITS#4986; does not break current tests, but needs review
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~408
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ea560284f073a034023a813c0d71d0d4febdd751;p=openldap

temporary fix to ITS#4986; does not break current tests, but needs review
---

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index b5d005b180..5ee85ecc4a 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -663,13 +663,24 @@ select_backend(
 			if ( strcmp( be->be_nsuffix[j].bv_val,
 				&dn->bv_val[dnlen-len] ) == 0 )
 			{
-				if( b2 == NULL ) {
+				if ( b2 == NULL ) {
 					b2 = be;
 
-					if( manageDSAit && len == dnlen &&
-						!SLAP_GLUE_SUBORDINATE( be ) ) {
+#if 0
+					/* causes ITS#4986: a catchall relay
+					 * database with empty suffix points
+					 * to another database; operations
+					 * directed to a specific database
+					 * fail if manageDSAit is set.
+					 * Not clear what's the purpose
+					 * of this test */
+					if ( manageDSAit && len == dnlen &&
+						!SLAP_GLUE_SUBORDINATE( be ) )
+					{
 						continue;
 					}
+#endif
+
 				} else {
 					/* If any parts of the tree are glued, use the first
 					 * match regardless of manageDSAit. Otherwise use the