ldb: Use ARRAY_DEL_ELEMENT() in ldb_dn_set_extended_component()

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

diff --git a/lib/ldb/common/ldb_dn.c b/lib/ldb/common/ldb_dn.c
index 54c845c38ba459c9e88fc0e83125cc853305e84d..001fcad621f058f5e1ae22317929f94d43447451 100644 (file)
--- a/lib/ldb/common/ldb_dn.c
+++ b/lib/ldb/common/ldb_dn.c
@@ -2062,12 +2062,10 @@ int ldb_dn_set_extended_component(struct ldb_dn *dn,
                                        return LDB_ERR_OPERATIONS_ERROR;
                                }
                        } else {
-                               if (i != (dn->ext_comp_num - 1)) {
-                                       memmove(&dn->ext_components[i],
-                                               &dn->ext_components[i+1],
-                                               ((dn->ext_comp_num-1) - i) *
-                                                 sizeof(*dn->ext_components));
-                               }
+                               ARRAY_DEL_ELEMENT(
+                                       dn->ext_components,
+                                       i,
+                                       dn->ext_comp_num);
                                dn->ext_comp_num--;
 
                                dn->ext_components = talloc_realloc(dn,