From: Garming Sam <garming@catalyst.net.nz>
Date: Thu, 9 Mar 2017 03:10:16 +0000 (+1300)
Subject: ldb_tdb: Add better comments for duplicate attr values
X-Git-Tag: tdb-1.3.13~503
X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=ee04f96b69eb7f7ea6f073cf8228f32252725f8e

ldb_tdb: Add better comments for duplicate attr values

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Pair-programmed-with: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/ldb/ldb_tdb/ldb_tdb.c b/lib/ldb/ldb_tdb/ldb_tdb.c
index 502afd9c3c8..6b1187e64ad 100644
--- a/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -361,7 +361,7 @@ static int ltdb_add_internal(struct ldb_module *module,
 				if (ldb_msg_find_val(el, &el->values[j]) != &el->values[j]) {
 					ldb_asprintf_errstring(ldb,
 							       "attribute '%s': value #%u on '%s' "
-							       "provided more than once",
+							       "provided more than once in ADD object",
 							       el->name, j, 
 							       ldb_dn_get_linearized(msg->dn));
 					return LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS;
@@ -820,7 +820,7 @@ int ltdb_modify_internal(struct ldb_module *module,
 						}
 						if (ldb_msg_find_val(el, &el->values[j]) != &el->values[j]) {
 							ldb_asprintf_errstring(ldb,
-									       "attribute '%s': value #%u on '%s' provided more than once",
+									       "attribute '%s': value #%u on '%s' provided more than once in ADD",
 									       el->name, j, ldb_dn_get_linearized(msg2->dn));
 							ret = LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS;
 							goto done;
@@ -875,7 +875,7 @@ int ltdb_modify_internal(struct ldb_module *module,
 				for (j=0; j<el->num_values; j++) {
 					if (ldb_msg_find_val(el, &el->values[j]) != &el->values[j]) {
 						ldb_asprintf_errstring(ldb,
-								       "attribute '%s': value #%u on '%s' provided more than once",
+								       "attribute '%s': value #%u on '%s' provided more than once in REPLACE",
 								       el->name, j, ldb_dn_get_linearized(msg2->dn));
 						ret = LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS;
 						goto done;