Spelling fixes s/conficts/conflicts/

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/lib/ldb/ldb_key_value/ldb_kv_index.c b/lib/ldb/ldb_key_value/ldb_kv_index.c
index 6d02c91a597fc3d6e7c972a5c3005ea024c5f88f..4dfcc2cb0ba916f918de46aeff06aa50ecf0da78 100644 (file)
--- a/lib/ldb/ldb_key_value/ldb_kv_index.c
+++ b/lib/ldb/ldb_key_value/ldb_kv_index.c
@@ -2318,7 +2318,7 @@ static int ldb_kv_index_add1(struct ldb_module *module,
                        ldb_debug(ldb, LDB_DEBUG_WARNING,
                                  __location__
                                  ": unique index violation on %s in %s, "
-                                 "conficts with %*.*s in %s",
+                                 "conflicts with %*.*s in %s",
                                  el->name, ldb_dn_get_linearized(msg->dn),
                                  (int)list->dn[0].length,
                                  (int)list->dn[0].length,
@@ -2337,7 +2337,7 @@ static int ldb_kv_index_add1(struct ldb_module *module,
                                          LDB_DEBUG_WARNING,
                                          __location__
                                          ": unique index violation on %s in "
-                                         "%s, conficts with %s %*.*s in %s",
+                                         "%s, conflicts with %s %*.*s in %s",
                                          el->name,
                                          ldb_dn_get_linearized(msg->dn),
                                          ldb_kv->cache->GUID_index_attribute,

diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c
index 52e7e90e60a2a263429c497321c91fbae6f036cb..0e91c6db2828189e3b875099377164fbc6b86e0e 100644 (file)
--- a/lib/ldb/tests/ldb_mod_op_test.c
+++ b/lib/ldb/tests/ldb_mod_op_test.c
@@ -3807,7 +3807,7 @@ static void test_ldb_unique_index_duplicate_logging(void **state)
        p = strstr(
                debug_string,
                "unique index violation on cn "
-               "in dc=test02, conficts with dc=test01 in "
+               "in dc=test02, conflicts with dc=test01 in "
                "@INDEX:CN:test_unique_index");
        assert_non_null(p);
        TALLOC_FREE(debug_string);
@@ -3991,7 +3991,7 @@ static void test_ldb_unique_index_duplicate_with_guid(void **state)
        assert_non_null(debug_string);
        p = strstr(
                debug_string,
-               "unique index violation on cn in dc=test02, conficts with "
+               "unique index violation on cn in dc=test02, conflicts with "
                "objectUUID 0123456789abcdef in @INDEX:CN:test_unique_index");
        assert_non_null(p);
        TALLOC_FREE(debug_string);