From af9e17379b34370f933f503220665f4fba3250f8 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 13 Sep 2007 17:55:45 +0000
Subject: [PATCH] further rework URI parsing

---
 servers/slapd/back-meta/config.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 92947b8bec..7a113034e0 100644
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -1292,11 +1292,10 @@ idassert-authzFrom	"dn:<rootdn>"
 					fname, lineno, argv[ 1 ] );
 			return 1;
 		}
-		
-		tmp_bd = select_backend( &nvnc, 0 );
-		if ( tmp_bd != NULL && tmp_bd->be_private != be->be_private ) {
-			Debug( LDAP_DEBUG_ANY, 
-	"%s: line %d: <suffix> \"%s\" already in use by another database, in "
+
+		if (!dnIsSuffix( &nvnc, &be->be_nsuffix[ 0 ] ) ) {
+			Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+	"%s: line %d: <suffix> \"%s\" must be within the database naming context, in "
 	"\"suffixMassage <suffix> <massaged suffix>\"\n",
 				fname, lineno, pvnc.bv_val );
 			free( pvnc.bv_val );
@@ -1317,12 +1316,9 @@ idassert-authzFrom	"dn:<rootdn>"
 		tmp_bd = select_backend( &nrnc, 0 );
 		if ( tmp_bd != NULL && tmp_bd->be_private == be->be_private ) {
 			Debug( LDAP_DEBUG_ANY, 
-	"%s: line %d: warning: <massaged suffix> \"%s\" point to this database, in "
+	"%s: line %d: warning: <massaged suffix> \"%s\" resolves to this database, in "
 	"\"suffixMassage <suffix> <massaged suffix>\"\n",
 				fname, lineno, prnc.bv_val );
-			free( pvnc.bv_val );
-			free( nvnc.bv_val );
-			return 1;						
 		}
 
 		/*
-- 
2.39.5