Changeset 745 for trunk/server/source4/torture/ldb

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/torture/ldb/ldb.c (modified) (12 diffs)

trunk/server/source4/torture/ldb/ldb.c

@@ -22 +22 @@
 #include "includes.h"
 #include "lib/events/events.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "ldb_wrap.h"
@@ -32 +32 @@
 
 static const char *sid = "S-1-5-21-4177067393-1453636373-93818737";
-static const char *hex_sid = "01040000000000051500000081FDF8F815BBA456718F9705";
+static const char *hex_sid = "01040000000000051500000081fdf8f815bba456718f9705";
 static const char *guid = "975ac5fa-35d9-431d-b86a-845bcd34fff9";
 static const char *guid2 = "{975ac5fa-35d9-431d-b86a-845bcd34fff9}";
-static const char *hex_guid = "FAC55A97D9351D43B86A845BCD34FFF9";
+static const char *hex_guid = "fac55a97d9351d43b86a845bcd34fff9";
 
 static const char *prefix_map_newline = "2:1.2.840.113556.1.2\n5:2.16.840.1.101.2.2.3";
@@ -58 +58 @@
 
         torture_assert_int_equal(torture, 
-                                 ldb_register_samba_handlers(ldb), 0, 
+                                 ldb_register_samba_handlers(ldb), LDB_SUCCESS,
                                  "Failed to register Samba handlers");
 
@@ -217 +217 @@
 
         torture_assert_int_equal(torture, 
-                                 ldb_register_samba_handlers(ldb), 0, 
+                                 ldb_register_samba_handlers(ldb), LDB_SUCCESS,
                                  "Failed to register Samba handlers");
 
@@ -335 +335 @@
 
         torture_assert_int_equal(torture, 
-                                 ldb_register_samba_handlers(ldb), 0, 
+                                 ldb_register_samba_handlers(ldb), LDB_SUCCESS,
                                  "Failed to register Samba handlers");
 
@@ -588 +588 @@
         struct ldb_dn *child_dn;
         struct ldb_dn *typo_dn;
+        struct ldb_dn *special_dn;
         struct ldb_val val;
 
@@ -595 +596 @@
 
         torture_assert_int_equal(torture, 
-                                 ldb_register_samba_handlers(ldb), 0, 
+                                 ldb_register_samba_handlers(ldb), LDB_SUCCESS,
                                  "Failed to register Samba handlers");
 
@@ -656 +657 @@
                        ldb_dn_compare_base(dn, typo_dn) != 0,
                        "Base Comparison on dc=samba,dc=org and c=samba,dc=org should != 0");
+
+        /* Check comparisons with a special DN */
+        torture_assert(torture,
+                       special_dn = ldb_dn_new(mem_ctx, ldb, "@special_dn"),
+                       "Failed to create 'special' DN");
+
+        torture_assert(torture,
+                       ldb_dn_compare(dn, special_dn) != 0,
+                       "Comparison on dc=samba,dc=org and @special_dn should != 0");
+
+        torture_assert(torture,
+                       ldb_dn_compare_base(special_dn, dn) > 0,
+                       "Base Comparison of @special_dn and dc=samba,dc=org should > 0");
+
+        torture_assert(torture,
+                       ldb_dn_compare_base(dn, special_dn) < 0,
+                       "Base Comparison on dc=samba,dc=org and @special_dn should < 0");
 
         /* Check DN based on MS-ADTS:3.1.1.5.1.2 Naming Constraints*/
@@ -662 +680 @@
                        "Failed to create 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");
+        }
+
+        /* Escaped comma */
         torture_assert(torture,
-                       ldb_dn_validate(dn) == false,
-                       "should have failed to validate a DN with 0xA in it");
-
-        val.data = "CN=Zer\0,DC=SAMBA,DC=org";
-        val.length = 23;
+                       dn = ldb_dn_new(mem_ctx, ldb, "CN=A\\,comma,DC=SAMBA,DC=org"),
+                       "Failed to create a DN with an escaped comma in it");
+
+
+        val = data_blob_const("CN=Zer\0,DC=SAMBA,DC=org", 23);
         torture_assert(torture,
                        NULL == ldb_dn_from_ldb_val(mem_ctx, ldb, &val),
                        "should fail to create a DN with 0x0 in it");
-
-        torture_assert(torture,
-                       dn = ldb_dn_new(mem_ctx, ldb, "CN=loooooooooooooooooooooooooooo"
-"ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"
-"ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"
-"ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"
-"ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"
-"ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongdn,DC=SAMBA,DC=org"),
-                       "Failed to create a DN with size more than 255 characters");
-
-        torture_assert(torture,
-                       ldb_dn_validate(dn) == false,
-                       "should have failed to validate DN with size more than 255 characters");
 
         talloc_free(mem_ctx);
@@ -702 +714 @@
 
         torture_assert_int_equal(torture, 
-                                 ldb_register_samba_handlers(ldb), 0, 
+                                 ldb_register_samba_handlers(ldb), LDB_SUCCESS,
                                  "Failed to register Samba handlers");
 
@@ -784 +796 @@
 struct torture_suite *torture_ldb(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "LDB");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "ldb");
 
         if (suite == NULL) {
@@ -790 +802 @@
         }
 
-        torture_suite_add_simple_test(suite, "ATTRS", torture_ldb_attrs);
-        torture_suite_add_simple_test(suite, "DN-ATTRS", torture_ldb_dn_attrs);
-        torture_suite_add_simple_test(suite, "DN-EXTENDED", torture_ldb_dn_extended);
-        torture_suite_add_simple_test(suite, "DN-INVALID-EXTENDED", torture_ldb_dn_invalid_extended);
-        torture_suite_add_simple_test(suite, "DN", torture_ldb_dn);
+        torture_suite_add_simple_test(suite, "attrs", torture_ldb_attrs);
+        torture_suite_add_simple_test(suite, "dn-attrs", torture_ldb_dn_attrs);
+        torture_suite_add_simple_test(suite, "dn-extended", torture_ldb_dn_extended);
+        torture_suite_add_simple_test(suite, "dn-invalid-extended", torture_ldb_dn_invalid_extended);
+        torture_suite_add_simple_test(suite, "dn", torture_ldb_dn);
 
         suite->description = talloc_strdup(suite, "LDB (samba-specific behaviour) tests");