s4-ldb: changed the DN checks for \n to warnings
authorAndrew Tridgell <tridge@samba.org>
Fri, 13 Nov 2009 08:31:40 +0000 (19:31 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 13 Nov 2009 08:32:47 +0000 (19:32 +1100)
a \n is sometimes allowed in AD (eg in deleted DNs). Until we know
when is really is allowed, treat it as a warning only.

source4/dsdb/common/tests/dsdb_dn.c
source4/torture/ldb/ldb.c

index 8f1aeca082c8d6b09eff1b2c196c919bc5277713..183bce28d02b51b8fece2c0a1914d8f2c98c3da4 100644 (file)
@@ -317,9 +317,12 @@ static bool torture_dsdb_dn_invalid(struct torture_context *torture)
 
        /* Check DN based on MS-ADTS:3.1.1.5.1.2 Naming Constraints*/
        val = data_blob_string_const("CN=New\nLine,DC=SAMBA,DC=org");
-       torture_assert(torture,
-                      dsdb_dn_parse(mem_ctx, ldb, &val, LDB_SYNTAX_DN) == NULL,
-                      "Should have Failed to create a DN with 0xA in it");
+
+       /* changed to a warning until we understand the DEL: DNs */
+       if (dsdb_dn_parse(mem_ctx, ldb, &val, LDB_SYNTAX_DN) != NULL) {
+               torture_warning(torture,
+                               "Should have Failed to create a DN with 0xA in it");
+       }
 
        val = data_blob_string_const("B:4:ABAB:CN=New\nLine,DC=SAMBA,DC=org");
        torture_assert(torture,
index f986372fe94fe818cdb02a1c8736147a884be260..dbfd96c59b26403fcc1711837004b6df9ae4c928 100644 (file)
@@ -661,9 +661,11 @@ static bool torture_ldb_dn(struct torture_context *torture)
                       dn = ldb_dn_new(mem_ctx, ldb, "CN=New\nLine,DC=SAMBA,DC=org"),
                       "Failed to create a DN with 0xA in it");
 
-       torture_assert(torture,
-                      ldb_dn_validate(dn) == false,
-                      "should have failed to validate a DN with 0xA in it");
+       /* this is a warning until we work out how the DEL: CNs work */
+       if (ldb_dn_validate(dn) != false) {
+               torture_warning(torture,
+                               "should have failed to validate a DN with 0xA in it");
+       }
 
        val = data_blob_const("CN=Zer\0,DC=SAMBA,DC=org", 23);
        torture_assert(torture,