From: Volker Lendecke <vl@samba.org>
Date: Thu, 26 Mar 2020 10:06:23 +0000 (+0100)
Subject: ldb: Use ARRAY_DEL_ELEMENT() in ldb_kv_msg_delete_element()
X-Git-Tag: ldb-2.2.0~1207
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d45174a060df301fc0f4b896336bd622fe6db9ed;p=thirdparty%2Fsamba.git

ldb: Use ARRAY_DEL_ELEMENT() in ldb_kv_msg_delete_element()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/lib/ldb/ldb_key_value/ldb_kv.c b/lib/ldb/ldb_key_value/ldb_kv.c
index 4e7b8a116b3..ed0f760b5a2 100644
--- a/lib/ldb/ldb_key_value/ldb_kv.c
+++ b/lib/ldb/ldb_key_value/ldb_kv.c
@@ -995,11 +995,7 @@ static int ldb_kv_msg_delete_element(struct ldb_module *module,
 				return ret;
 			}
 
-			if (i<el->num_values-1) {
-				memmove(&el->values[i], &el->values[i+1],
-					sizeof(el->values[i])*
-						(el->num_values-(i+1)));
-			}
+			ARRAY_DEL_ELEMENT(el->values, i, el->num_values);
 			el->num_values--;
 
 			/* per definition we find in a canonicalised message an