From: Volker Lendecke <vl@samba.org>
Date: Thu, 26 Mar 2020 09:36:19 +0000 (+0100)
Subject: libsmb: Use ARRAY_DEL_ELEMENT() in remove_duplicate_addrs2()
X-Git-Tag: ldb-2.2.0~1212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eadbaabca1b03b2a49cd67e0286f05ae83e9b4b2;p=thirdparty%2Fsamba.git

libsmb: Use ARRAY_DEL_ELEMENT() in remove_duplicate_addrs2()

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

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 454ea61a895..642f7b91b5a 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1166,11 +1166,7 @@ int remove_duplicate_addrs2(struct ip_service *iplist, int count )
 	for (i = 0; i < count; i++) {
 		while (i < count &&
 				is_zero_addr(&iplist[i].ss)) {
-			if (count-i-1>0) {
-				memmove(&iplist[i],
-					&iplist[i+1],
-					(count-i-1)*sizeof(struct ip_service));
-			}
+			ARRAY_DEL_ELEMENT(iplist, i, count);
 			count--;
 		}
 	}