lib: addns: Fix ads_dns_lookup_ns(), ads_dns_query_dcs(), ads_dns_query_gcs(), ads_dns_query_kdcs(), ads_dns_query_pdc() to return size_t *.

Easier to do all callers at once.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>

2 files changed, 13 insertions, 17 deletions

diff --git a/lib/addns/dnsquery.c b/lib/addns/dnsquery.c
index 92709234edb..c73ee7b50f1 100644
--- a/lib/addns/dnsquery.c
+++ b/lib/addns/dnsquery.c
@@ -347,7 +347,7 @@ NTSTATUS ads_dns_lookup_ns_recv(struct tevent_req *req,
 NTSTATUS ads_dns_lookup_ns(TALLOC_CTX *ctx,
 				const char *dnsdomain,
 				struct dns_rr_ns **nslist,
-				int *numns)
+				size_t *numns)
 {
 	struct tevent_context *ev;
 	struct tevent_req *req;
@@ -791,7 +791,7 @@ static NTSTATUS ads_dns_query_internal(TALLOC_CTX *ctx,
 				       const char *realm,
 				       const char *sitename,
 				       struct dns_rr_srv **dclist,
-				       int *numdcs )
+				       size_t *numdcs )
 {
 	char *name;
 	NTSTATUS status;
@@ -827,10 +827,6 @@ static NTSTATUS ads_dns_query_internal(TALLOC_CTX *ctx,
 	status = ads_dns_lookup_srv(ctx, name, dclist, &num_srvs);
 
 done:
-	/* check overflow size_t -> int */
-	if ((int)num_srvs < 0) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
 	*numdcs = num_srvs;
 	return status;
 }
@@ -843,7 +839,7 @@ NTSTATUS ads_dns_query_dcs(TALLOC_CTX *ctx,
 			   const char *realm,
 			   const char *sitename,
 			   struct dns_rr_srv **dclist,
-			   int *numdcs )
+			   size_t *numdcs )
 {
 	NTSTATUS status;
 
@@ -865,7 +861,7 @@ NTSTATUS ads_dns_query_gcs(TALLOC_CTX *ctx,
 			   const char *realm,
 			   const char *sitename,
 			   struct dns_rr_srv **dclist,
-			   int *numdcs )
+			   size_t *numdcs )
 {
 	NTSTATUS status;
 
@@ -889,7 +885,7 @@ NTSTATUS ads_dns_query_kdcs(TALLOC_CTX *ctx,
 			    const char *dns_forest_name,
 			    const char *sitename,
 			    struct dns_rr_srv **dclist,
-			    int *numdcs )
+			    size_t *numdcs )
 {
 	NTSTATUS status;
 
@@ -910,7 +906,7 @@ NTSTATUS ads_dns_query_kdcs(TALLOC_CTX *ctx,
 NTSTATUS ads_dns_query_pdc(TALLOC_CTX *ctx,
 			   const char *dns_domain_name,
 			   struct dns_rr_srv **dclist,
-			   int *numdcs )
+			   size_t *numdcs )
 {
 	return ads_dns_query_internal(ctx,
 				      "_ldap",
@@ -929,7 +925,7 @@ NTSTATUS ads_dns_query_dcs_guid(TALLOC_CTX *ctx,
 				const char *dns_forest_name,
 				const char *domain_guid,
 				struct dns_rr_srv **dclist,
-				int *numdcs )
+				size_t *numdcs )
 {
 	/*_ldap._tcp.DomainGuid.domains._msdcs.DnsForestName */
 
diff --git a/lib/addns/dnsquery.h b/lib/addns/dnsquery.h
index ddcafeb3936..777f1a7de6a 100644
--- a/lib/addns/dnsquery.h
+++ b/lib/addns/dnsquery.h
@@ -47,7 +47,7 @@ NTSTATUS ads_dns_lookup_ns_recv(struct tevent_req *req,
 NTSTATUS ads_dns_lookup_ns(TALLOC_CTX *ctx,
 				const char *dnsdomain,
 				struct dns_rr_ns **nslist,
-				int *numns);
+				size_t *numns);
 struct tevent_req *ads_dns_lookup_a_send(TALLOC_CTX *mem_ctx,
 				struct tevent_context *ev,
 				const char *name);
@@ -83,24 +83,24 @@ NTSTATUS ads_dns_query_dcs(TALLOC_CTX *ctx,
 			   const char *realm,
 			   const char *sitename,
 			   struct dns_rr_srv **dclist,
-			   int *numdcs );
+			   size_t *numdcs );
 NTSTATUS ads_dns_query_gcs(TALLOC_CTX *ctx,
 			   const char *realm,
 			   const char *sitename,
 			   struct dns_rr_srv **dclist,
-			   int *numdcs );
+			   size_t *numdcs );
 NTSTATUS ads_dns_query_kdcs(TALLOC_CTX *ctx,
 			    const char *dns_forest_name,
 			    const char *sitename,
 			    struct dns_rr_srv **dclist,
-			    int *numdcs );
+			    size_t *numdcs );
 NTSTATUS ads_dns_query_pdc(TALLOC_CTX *ctx,
 			   const char *dns_domain_name,
 			   struct dns_rr_srv **dclist,
-			   int *numdcs );
+			   size_t *numdcs );
 NTSTATUS ads_dns_query_dcs_guid(TALLOC_CTX *ctx,
 				const char *dns_forest_name,
 				const char *domain_guid,
 				struct dns_rr_srv **dclist,
-				int *numdcs );
+				size_t *numdcs );
 #endif	/* _ADS_DNS_H */