From: Mathieu Parent <math.parent@gmail.com>
Date: Mon, 25 Mar 2019 14:22:49 +0000 (+0100)
Subject: Spelling fixes s/conficts/conflicts/
X-Git-Tag: tdb-1.4.1~551
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=882d8a5bf416b6574daa8dafa145740fa6b10d6d;p=thirdparty%2Fsamba.git

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 6d02c91a597..4dfcc2cb0ba 100644
--- 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 52e7e90e60a..0e91c6db282 100644
--- 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);