From: Jeremy Allison <jra@samba.org>
Date: Wed, 26 Aug 2020 22:26:54 +0000 (-0700)
Subject: s3: libsmb: Cleanup the code to do one address return given an IP address to _interna... 
X-Git-Tag: talloc-2.3.2~596
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ffb18856bf128de635af4d9dd1e1582295778c2;p=thirdparty%2Fsamba.git

s3: libsmb: Cleanup the code to do one address return given an IP address to _internal_resolve_name().

Will make easier to move to talloc later.

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

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 688e62d64fc..ba103f6c7fc 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3198,31 +3198,33 @@ static NTSTATUS _internal_resolve_name(const char *name,
 		name, name_type, sitename ? sitename : "(null)");
 
 	if (is_ipaddress(name)) {
-		*return_iplist = SMB_MALLOC_P(struct ip_service);
-		if (*return_iplist == NULL) {
-			DBG_ERR("malloc fail !\n");
-			TALLOC_FREE(frame);
-			return NT_STATUS_NO_MEMORY;
-		}
-
-		/* ignore the port here */
-		(*return_iplist)->port = PORT_NONE;
+		struct ip_service *iplist = NULL;
+		struct sockaddr_storage ss;
 
 		/* if it's in the form of an IP address then get the lib to interpret it */
-		ok = interpret_string_addr(&(*return_iplist)->ss,
-					name, AI_NUMERICHOST);
+		ok = interpret_string_addr(&ss, name, AI_NUMERICHOST);
 		if (!ok) {
 			DBG_WARNING("interpret_string_addr failed on %s\n",
 				name);
-			SAFE_FREE(*return_iplist);
 			TALLOC_FREE(frame);
 			return NT_STATUS_INVALID_PARAMETER;
 		}
-		if (is_zero_addr(&(*return_iplist)->ss)) {
-			SAFE_FREE(*return_iplist);
+		if (is_zero_addr(&ss)) {
 			TALLOC_FREE(frame);
 			return NT_STATUS_UNSUCCESSFUL;
 		}
+
+		iplist = SMB_MALLOC_P(struct ip_service);
+		if (iplist == NULL) {
+			TALLOC_FREE(frame);
+			return NT_STATUS_NO_MEMORY;
+		}
+
+		iplist[0].ss = ss;
+		/* ignore the port here */
+		iplist[0].port = PORT_NONE;
+
+		*return_iplist = iplist;
 		*return_count = 1;
 		TALLOC_FREE(frame);
 		return NT_STATUS_OK;