From d627ef14885b7ab16b1d40b3954c1aa92e313330 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 9 Sep 2020 10:45:21 -0700
Subject: [PATCH] s3: libsmb: namequery.c: Remove unused
 remove_duplicate_addrs2().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
---
 source3/libsmb/namequery.c | 55 --------------------------------------
 source3/libsmb/namequery.h |  1 -
 2 files changed, 56 deletions(-)

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index d131976377e..a7d68fcedcb 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1229,61 +1229,6 @@ static void sort_sa_list(struct samba_sockaddr *salist, size_t count)
 	TYPESAFE_QSORT(salist, count, samba_sockaddr_compare);
 }
 
-#if 0
-/**********************************************************************
- Remove any duplicate address/port pairs in the list
- *********************************************************************/
-
-size_t remove_duplicate_addrs2(struct ip_service *iplist, size_t count )
-{
-	size_t i, j;
-
-	DEBUG(10,("remove_duplicate_addrs2: "
-			"looking for duplicate address/port pairs\n"));
-
-	/* One loop to set duplicates to a zero addr. */
-	for ( i=0; i<count; i++ ) {
-		bool ok;
-		struct samba_sockaddr sa_i = {0};
-
-		ok = sockaddr_storage_to_samba_sockaddr(&sa_i, &iplist[i].ss);
-		if (!ok) {
-			continue;
-		}
-
-		if (is_zero_addr(&sa_i.u.ss)) {
-			continue;
-		}
-
-		for ( j=i+1; j<count; j++ ) {
-			struct samba_sockaddr sa_j = {0};
-
-			ok = sockaddr_storage_to_samba_sockaddr(&sa_j,
-							&iplist[j].ss);
-			if (!ok) {
-				continue;
-			}
-
-			if (sockaddr_equal(&sa_i.u.sa, &sa_j.u.sa) &&
-					iplist[i].port == iplist[j].port) {
-				zero_sockaddr(&iplist[j].ss);
-			}
-		}
-	}
-
-	/* Now remove any addresses set to zero above. */
-	for (i = 0; i < count; i++) {
-		while (i < count &&
-				is_zero_addr(&iplist[i].ss)) {
-			ARRAY_DEL_ELEMENT(iplist, i, count);
-			count--;
-		}
-	}
-
-	return count;
-}
-#endif
-
 /**********************************************************************
  Remove any duplicate address/port pairs in the samba_sockaddr array.
  *********************************************************************/
diff --git a/source3/libsmb/namequery.h b/source3/libsmb/namequery.h
index ef717738ac6..e023b441fd8 100644
--- a/source3/libsmb/namequery.h
+++ b/source3/libsmb/namequery.h
@@ -47,7 +47,6 @@ bool name_status_find(const char *q_name,
 			int type,
 			const struct sockaddr_storage *to_ss,
 			fstring name);
-size_t remove_duplicate_addrs2(struct ip_service *iplist, size_t count );
 size_t remove_duplicate_addrs2_sa(struct samba_sockaddr *salist, size_t count);
 struct tevent_req *name_query_send(TALLOC_CTX *mem_ctx,
 				   struct tevent_context *ev,