Undo - 555577 - Syntax validation fails for "ou=NetscapeRoot" tree

https://bugzilla.redhat.com/show_bug.cgi?id=555577

Undoing the previous checkin.
The parameter "strict" is for the trength of the DN validation.
It should be confusing to use it for turning on/off the validation
itself.

4 files changed, 25 insertions, 40 deletions

diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c
index 6f51aea3..75c64c3d 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_add.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c
@@ -193,15 +193,12 @@ ldbm_back_add( Slapi_PBlock *pb )
 			{
 				goto error_return;
 			}
-			if (config_get_dn_validate_strict())
+			ldap_result_code = slapi_dn_syntax_check(pb, dn, 1);
+			if (ldap_result_code)
 			{
-				ldap_result_code = slapi_dn_syntax_check(pb, dn, 1);
-				if (ldap_result_code)
-				{
-					ldap_result_code = LDAP_INVALID_DN_SYNTAX;
-					slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message);
-					goto error_return;
-				}
+				ldap_result_code = LDAP_INVALID_DN_SYNTAX;
+				slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message);
+				goto error_return;
 			}
 			slapi_sdn_set_dn_byref(&sdn, dn);
 			slapi_sdn_get_backend_parent(&sdn,&parentsdn,pb->pb_backend);
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
index f9933054..97873003 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
@@ -103,15 +103,12 @@ ldbm_back_delete( Slapi_PBlock *pb )
 	{
 		goto error_return;
 	}
-	if (config_get_dn_validate_strict())
+	ldap_result_code = slapi_dn_syntax_check(pb, addr->dn, 1);
+	if (ldap_result_code)
 	{
-		ldap_result_code = slapi_dn_syntax_check(pb, addr->dn, 1);
-		if (ldap_result_code)
-		{
-			ldap_result_code = LDAP_INVALID_DN_SYNTAX;
-			slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message);
-			goto error_return;
-		}
+		ldap_result_code = LDAP_INVALID_DN_SYNTAX;
+		slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message);
+		goto error_return;
 	}
 
 	is_fixup_operation = operation_is_flag_set(operation, OP_FLAG_REPL_FIXUP);
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
index 165e6555..9a0bea07 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -224,15 +224,12 @@ ldbm_back_modify( Slapi_PBlock *pb )
 	{
 		goto error_return;
 	}
-	if (config_get_dn_validate_strict())
+	ldap_result_code = slapi_dn_syntax_check(pb, addr->dn, 1);
+	if (ldap_result_code)
 	{
-		ldap_result_code = slapi_dn_syntax_check(pb, addr->dn, 1);
-		if (ldap_result_code)
-		{
-			ldap_result_code = LDAP_INVALID_DN_SYNTAX;
-			slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message);
-			goto error_return;
-		}
+		ldap_result_code = LDAP_INVALID_DN_SYNTAX;
+		slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message);
+		goto error_return;
 	}
 	dblayer_txn_init(li,&txn);
 
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
index 40a5888b..7af84323 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
@@ -204,15 +204,12 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
             slapi_sdn_set_dn_passin(&dn_newdn,newdn);
             new_addr.dn = (char*)slapi_sdn_get_ndn (&dn_newdn);
             /* check dn syntax on newdn */
-            if (config_get_dn_validate_strict())
+            ldap_result_code = slapi_dn_syntax_check(pb, new_addr.dn, 1);
+            if (ldap_result_code)
             {
-                ldap_result_code = slapi_dn_syntax_check(pb, new_addr.dn, 1);
-                if (ldap_result_code)
-                {
-                    ldap_result_code = LDAP_INVALID_DN_SYNTAX;
-                    slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message);
-                    goto error_return;
-                }
+                ldap_result_code = LDAP_INVALID_DN_SYNTAX;
+                slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message);
+                goto error_return;
             }
             new_addr.uniqueid = NULL;
             ldap_result_code= get_copy_of_entry(pb, &new_addr, &txn, SLAPI_MODRDN_EXISTING_ENTRY, 0);
@@ -272,15 +269,12 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
             /* find and lock the entry we are about to modify */
             done_with_pblock_entry(pb,SLAPI_MODRDN_TARGET_ENTRY); /* Could be through this multiple times */
             slapi_pblock_get (pb, SLAPI_TARGET_ADDRESS, &old_addr);
-            if (config_get_dn_validate_strict())
+            ldap_result_code = slapi_dn_syntax_check(pb, old_addr->dn, 1);
+            if (ldap_result_code)
             {
-                ldap_result_code = slapi_dn_syntax_check(pb, old_addr->dn, 1);
-                if (ldap_result_code)
-                {
-                    ldap_result_code = LDAP_INVALID_DN_SYNTAX;
-                    slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message);
-                    goto error_return;
-                }
+                ldap_result_code = LDAP_INVALID_DN_SYNTAX;
+                slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message);
+                goto error_return;
             }
             ldap_result_code= get_copy_of_entry(pb, old_addr, &txn, SLAPI_MODRDN_TARGET_ENTRY, !is_replicated_operation);
             if(ldap_result_code==LDAP_OPERATIONS_ERROR ||