From: Volker Lendecke <vl@samba.org>
Date: Sat, 13 Jun 2026 12:51:47 +0000 (+0200)
Subject: libsmb: Convert resolve_name() to return struct samba_sockaddr
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ada9ed188370972ed00518b076072799f8bbe590;p=thirdparty%2Fsamba.git

libsmb: Convert resolve_name() to return struct samba_sockaddr

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 66853f5661c..43c04b01ba5 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -911,7 +911,7 @@ static ADS_STATUS ads_connect_internal(ADS_STRUCT *ads,
 
 	if (ads->server.ldap_server) {
 		bool ok = false;
-		struct sockaddr_storage ss;
+		struct samba_sockaddr ss;
 
 		DBG_DEBUG("Resolving name of LDAP server '%s'.\n",
 			  ads->server.ldap_server);
@@ -923,12 +923,12 @@ static ADS_STATUS ads_connect_internal(ADS_STRUCT *ads,
 			goto out;
 		}
 
-		if (is_zero_addr(&ss)) {
+		if (is_zero_addr(&ss.u.ss)) {
 			status = ADS_ERROR_NT(NT_STATUS_NOT_FOUND);
 			goto out;
 		}
 
-		ok = ads_try_connect(ads, ads->server.gc, &ss);
+		ok = ads_try_connect(ads, ads->server.gc, &ss.u.ss);
 		if (ok) {
 			goto got_connection;
 		}
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 2310990a22c..90250dd9ee5 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -466,7 +466,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
 	uint16_t port = 0;
 	SMBCSRV *srv  = NULL;
 	SMBCFILE *dir = NULL;
-	struct sockaddr_storage rem_ss;
+	struct samba_sockaddr rem_ss;
 	TALLOC_CTX *frame = talloc_stackframe();
 
 	if (!context || !context->internal->initialized) {
@@ -759,10 +759,12 @@ SMBC_opendir_ctx(SMBCCTX *context,
 				 * Get the backup list ...
 				 */
 				if (!name_status_find(wgroup, 0, 0,
-                                                      &rem_ss, buserver)) {
+                                                      &rem_ss.u.ss, buserver)) {
 					char addr[INET6_ADDRSTRLEN];
 
-					print_sockaddr(addr, sizeof(addr), &rem_ss);
+					print_sockaddr(addr,
+						       sizeof(addr),
+						       &rem_ss.u.ss);
                                         DEBUG(0,("Could not get name of "
                                                 "local/domain master browser "
                                                 "for workgroup %s from "
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 8e3b8581438..a3e70caab6f 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -2976,9 +2976,9 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
 *********************************************************/
 
 bool resolve_name(const char *name,
-		struct sockaddr_storage *return_ss,
-		int name_type,
-		bool prefer_ipv4)
+		  struct samba_sockaddr *return_ss,
+		  int name_type,
+		  bool prefer_ipv4)
 {
 	struct samba_sockaddr *sa_list = NULL;
 	char *sitename = NULL;
@@ -2987,7 +2987,13 @@ bool resolve_name(const char *name,
 	TALLOC_CTX *frame = NULL;
 
 	if (is_ipaddress(name)) {
-		return interpret_string_addr(return_ss, name, AI_NUMERICHOST);
+		struct sockaddr_storage ss;
+		bool ok = interpret_string_addr(&ss, name, AI_NUMERICHOST);
+		if (!ok) {
+			return false;
+		}
+		sockaddr_storage_to_samba_sockaddr(return_ss, &ss);
+		return true;
 	}
 
 	frame = talloc_stackframe();
@@ -3008,7 +3014,7 @@ bool resolve_name(const char *name,
 			for (i=0; i<count; i++) {
 				if (!is_broadcast_addr(&sa_list[i].u.sa) &&
 						(sa_list[i].u.ss.ss_family == AF_INET)) {
-					*return_ss = sa_list[i].u.ss;
+					*return_ss = sa_list[i];
 					TALLOC_FREE(sa_list);
 					TALLOC_FREE(frame);
 					return True;
@@ -3019,7 +3025,7 @@ bool resolve_name(const char *name,
 		/* only return valid addresses for TCP connections */
 		for (i=0; i<count; i++) {
 			if (!is_broadcast_addr(&sa_list[i].u.sa)) {
-				*return_ss = sa_list[i].u.ss;
+				*return_ss = sa_list[i];
 				TALLOC_FREE(sa_list);
 				TALLOC_FREE(frame);
 				return True;
@@ -3430,7 +3436,7 @@ static NTSTATUS get_dc_list(TALLOC_CTX *ctx,
 
 		/* explicit lookup; resolve_name() will
 		 * handle names & IP addresses */
-		if (resolve_name(name, &name_sa.u.ss, 0x20, true)) {
+		if (resolve_name(name, &name_sa, 0x20, true)) {
 			char addr[INET6_ADDRSTRLEN];
 			bool has_entry;
 			bool ok;
diff --git a/source3/libsmb/namequery.h b/source3/libsmb/namequery.h
index 16559f9cd26..31e4d760465 100644
--- a/source3/libsmb/namequery.h
+++ b/source3/libsmb/namequery.h
@@ -92,9 +92,9 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
 				size_t *ret_count,
 				const char **resolve_order);
 bool resolve_name(const char *name,
-		struct sockaddr_storage *return_ss,
-		int name_type,
-		bool prefer_ipv4);
+		  struct samba_sockaddr *return_ss,
+		  int name_type,
+		  bool prefer_ipv4);
 NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
 		const char *name,
 		int name_type,
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 002ead6d5f9..81339ad0c20 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -4008,7 +4008,7 @@ static NTSTATUS cli_rpc_pipe_open(struct cli_state *cli,
 		bool ok;
 
 		ok = resolve_name(remote_name,
-				  &saddr.u.ss,
+				  &saddr,
 				  NBT_NAME_SERVER,
 				  false);
 		if (!ok) {
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index fb111079298..5050f4ccfac 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -2461,7 +2461,7 @@ static bool spoolss_connect_to_client(struct rpc_pipe_client **pp_pipe, struct c
 				      struct sockaddr_storage *client_ss, const char *remote_machine)
 {
 	NTSTATUS ret;
-	struct sockaddr_storage rm_addr;
+	struct samba_sockaddr rm_addr;
 	char addr[INET6_ADDRSTRLEN];
 	struct cli_credentials *anon_creds = NULL;
 	struct smb_transports ts =
@@ -2475,10 +2475,10 @@ static bool spoolss_connect_to_client(struct rpc_pipe_client **pp_pipe, struct c
 			DEBUG(2,("spoolss_connect_to_client: Can't resolve address for %s\n", remote_machine));
 			return false;
 		}
-		print_sockaddr(addr, sizeof(addr), &rm_addr);
+		print_sockaddr(addr, sizeof(addr), &rm_addr.u.ss);
 	} else {
-		rm_addr = *client_ss;
-		print_sockaddr(addr, sizeof(addr), &rm_addr);
+		sockaddr_storage_to_samba_sockaddr(&rm_addr, client_ss);
+		print_sockaddr(addr, sizeof(addr), &rm_addr.u.ss);
 		DEBUG(5,("spoolss_connect_to_client: Using address %s (no name resolution necessary)\n",
 			addr));
 	}
@@ -2500,7 +2500,7 @@ static bool spoolss_connect_to_client(struct rpc_pipe_client **pp_pipe, struct c
 					pp_cli,
 					lp_netbios_name(),
 					remote_machine,
-					&rm_addr,
+					&rm_addr.u.ss,
 					&ts,
 					"IPC$",
 					"IPC",
diff --git a/source3/smbd/smb2_reply.c b/source3/smbd/smb2_reply.c
index a8c19ef4a0e..6bdc02c2374 100644
--- a/source3/smbd/smb2_reply.c
+++ b/source3/smbd/smb2_reply.c
@@ -621,7 +621,7 @@ static bool netbios_session_retarget(struct smbXsrv_connection *xconn,
 	char *p;
 	int retarget_type = 0x20;
 	int retarget_port = NBT_SMB_PORT;
-	struct sockaddr_storage retarget_addr;
+	struct samba_sockaddr retarget_addr;
 	struct sockaddr_in *in_addr;
 	bool ret = false;
 	uint8_t outbuf[10];
@@ -679,12 +679,12 @@ static bool netbios_session_retarget(struct smbXsrv_connection *xconn,
 		goto fail;
 	}
 
-	if (retarget_addr.ss_family != AF_INET) {
+	if (retarget_addr.u.ss.ss_family != AF_INET) {
 		DEBUG(10, ("Retarget target not an IPv4 addr\n"));
 		goto fail;
 	}
 
-	in_addr = (struct sockaddr_in *)(void *)&retarget_addr;
+	in_addr = &retarget_addr.u.in;
 
 	_smb_setlen(outbuf, 6);
 	SCVAL(outbuf, 0, 0x84);
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 31d43afbfa4..49bec2b6112 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -4151,7 +4151,7 @@ static bool run_negprot_nowait(int dummy)
 static bool run_bad_nbt_session(int dummy)
 {
 	struct nmb_name called, calling;
-	struct sockaddr_storage ss;
+	struct samba_sockaddr ss;
 	NTSTATUS status;
 	int fd;
 	bool ret;
@@ -4166,7 +4166,7 @@ static bool run_bad_nbt_session(int dummy)
 		return false;
 	}
 
-	status = open_socket_out(&ss, NBT_SMB_PORT, 10000, &fd);
+	status = open_socket_out(&ss.u.ss, NBT_SMB_PORT, 10000, &fd);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, "open_socket_out failed: %s\n",
 			  nt_errstr(status));
@@ -12492,7 +12492,7 @@ static bool run_tldap(int dummy)
 	int fd;
 	TLDAPRC rc;
 	NTSTATUS status;
-	struct sockaddr_storage addr;
+	struct samba_sockaddr addr;
 	struct tevent_context *ev;
 	struct tevent_req *req;
 	char *basedn;
@@ -12530,7 +12530,7 @@ static bool run_tldap(int dummy)
 		d_printf("could not find host %s\n", host);
 		return false;
 	}
-	status = open_socket_out(&addr, tcp_port, 9999, &fd);
+	status = open_socket_out(&addr.u.ss, tcp_port, 9999, &fd);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("open_socket_out failed: %s\n", nt_errstr(status));
 		return false;
@@ -15113,7 +15113,7 @@ static bool run_smb1_truncated_sesssetup(int dummy)
 	};
 	struct smbXcli_transport *xtp = NULL;
 	struct smbXcli_conn *conn;
-	struct sockaddr_storage ss;
+	struct samba_sockaddr ss;
 	NTSTATUS status;
 	int fd;
 	bool ok;
@@ -15126,7 +15126,7 @@ static bool run_smb1_truncated_sesssetup(int dummy)
 		return false;
 	}
 
-	status = open_socket_out(&ss, 445, 10000, &fd);
+	status = open_socket_out(&ss.u.ss, 445, 10000, &fd);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, "open_socket_out failed: %s\n",
 			  nt_errstr(status));
@@ -15316,7 +15316,7 @@ static bool run_smb1_negotiate_exit(int dummy)
 	};
 	struct smbXcli_transport *xtp = NULL;
 	struct smbXcli_conn *conn;
-	struct sockaddr_storage ss;
+	struct samba_sockaddr ss;
 	NTSTATUS status;
 	int fd;
 	bool ok;
@@ -15329,7 +15329,7 @@ static bool run_smb1_negotiate_exit(int dummy)
 		return false;
 	}
 
-	status = open_socket_out(&ss, 445, 10000, &fd);
+	status = open_socket_out(&ss.u.ss, 445, 10000, &fd);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, "open_socket_out failed: %s\n",
 			  nt_errstr(status));
@@ -15441,7 +15441,7 @@ static bool run_ign_bad_negprot(int dummy)
 	};
 	struct smbXcli_transport *xtp = NULL;
 	struct smbXcli_conn *conn;
-	struct sockaddr_storage ss;
+	struct samba_sockaddr ss;
 	NTSTATUS status;
 	int fd;
 	bool ok;
@@ -15454,7 +15454,7 @@ static bool run_ign_bad_negprot(int dummy)
 		return false;
 	}
 
-	status = open_socket_out(&ss, 445, 10000, &fd);
+	status = open_socket_out(&ss.u.ss, 445, 10000, &fd);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, "open_socket_out failed: %s\n",
 			  nt_errstr(status));
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index c1f054684ff..fec639b7272 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -2251,7 +2251,7 @@ static int net_ads_printer_publish(struct net_context *c,
 	const char *printername = NULL;
 	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_hnd = NULL;
-	struct sockaddr_storage server_ss = { 0 };
+	struct samba_sockaddr server_ss = { 0 };
 	NTSTATUS nt_status;
 	ADS_MODLIST mods = NULL;
 	char *prt_dn = NULL;
@@ -2313,7 +2313,7 @@ static int net_ads_printer_publish(struct net_context *c,
 					      &cli,
 					      lp_netbios_name(),
 					      servername,
-					      &server_ss,
+					      &server_ss.u.ss,
 					      &ts,
 					      "IPC$",
 					      "IPC",
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 33433830b4f..f104c4006c8 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -46,7 +46,7 @@ int net_lookup_usage(struct net_context *c, int argc, const char **argv)
 /* lookup a hostname giving an IP */
 static int net_lookup_host(struct net_context *c, int argc, const char **argv)
 {
-	struct sockaddr_storage ss;
+	struct samba_sockaddr ss;
 	int name_type = 0x20;
 	char addr[INET6_ADDRSTRLEN];
 	const char *name = argv[0];
@@ -68,7 +68,7 @@ static int net_lookup_host(struct net_context *c, int argc, const char **argv)
 		return -1;
 	}
 
-	print_sockaddr(addr, sizeof(addr), &ss);
+	print_sockaddr(addr, sizeof(addr), &ss.u.ss);
 	d_printf("%s\n", addr);
 	return 0;
 }
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index eb6457073d8..bd1bcb22c0f 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -297,11 +297,13 @@ bool net_find_server(struct net_context *c,
 			*server_name = SMB_STRDUP(addr);
 		}
 	} else if (*server_name) {
+		struct samba_sockaddr ss;
 		/* resolve the IP address */
-		if (!resolve_name(*server_name, server_ss, 0x20, false))  {
+		if (!resolve_name(*server_name, &ss, 0x20, false))  {
 			DEBUG(1,("Unable to resolve server name\n"));
 			return false;
 		}
+		*server_ss = ss.u.ss;
 	} else if (flags & NET_FLAGS_PDC) {
 		fstring dc_name;
 		struct sockaddr_storage pdc_ss;
@@ -322,7 +324,7 @@ bool net_find_server(struct net_context *c,
 		*server_name = SMB_STRDUP(dc_name);
 		*server_ss = pdc_ss;
 	} else if (flags & NET_FLAGS_DMB) {
-		struct sockaddr_storage msbrow_ss;
+		struct samba_sockaddr msbrow_ss;
 		char addr[INET6_ADDRSTRLEN];
 
 		/*  if (!resolve_name(MSBROWSE, &msbrow_ip, 1, false)) */
@@ -330,18 +332,18 @@ bool net_find_server(struct net_context *c,
 			DEBUG(1,("Unable to resolve domain browser via name lookup\n"));
 			return false;
 		}
-		*server_ss = msbrow_ss;
+		*server_ss = msbrow_ss.u.ss;
 		print_sockaddr(addr, sizeof(addr), server_ss);
 		*server_name = SMB_STRDUP(addr);
 	} else if (flags & NET_FLAGS_MASTER) {
-		struct sockaddr_storage brow_ss;
+		struct samba_sockaddr brow_ss;
 		char addr[INET6_ADDRSTRLEN];
 		if (!resolve_name(d, &brow_ss, 0x1D, false))  {
 				/* go looking for workgroups */
 			DEBUG(1,("Unable to resolve master browser via name lookup\n"));
 			return false;
 		}
-		*server_ss = brow_ss;
+		*server_ss = brow_ss.u.ss;
 		print_sockaddr(addr, sizeof(addr), server_ss);
 		*server_name = SMB_STRDUP(addr);
 	} else if (!(flags & NET_FLAGS_LOCALHOST_DEFAULT_INSANE)) {
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index ebf28097500..70c444cb7f2 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -276,7 +276,7 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
 static void start_filter(char *desthost)
 {
 	int s, c;
-	struct sockaddr_storage dest_ss;
+	struct samba_sockaddr dest_ss;
 	struct sockaddr_storage my_ss;
 
 	CatchChild();
@@ -312,7 +312,7 @@ static void start_filter(char *desthost)
 				smb_set_close_on_exec(c);
 				if (fork() == 0) {
 					close(s);
-					filter_child(c, &dest_ss);
+					filter_child(c, &dest_ss.u.ss);
 					exit(0);
 				} else {
 					close(c);
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 36aaa4f0a8e..361d0052241 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -300,9 +300,7 @@ static NTSTATUS idmap_ad_get_tldap_ctx(TALLOC_CTX *mem_ctx,
 				       struct tldap_context **pld)
 {
 	struct netr_DsRGetDCNameInfo *dcinfo;
-	struct sockaddr_storage dcaddr = {
-		.ss_family = AF_UNSPEC,
-	};
+	struct samba_sockaddr dcaddr = {};
 	struct sockaddr_storage *pdcaddr = NULL;
 	struct winbindd_domain *creds_domain = NULL;
 	struct cli_credentials *creds;
@@ -372,7 +370,7 @@ static NTSTATUS idmap_ad_get_tldap_ctx(TALLOC_CTX *mem_ctx,
 	 */
 	if (strequal(domname, lp_realm()) || strequal(domname, lp_workgroup()))
 	{
-		pdcaddr = &dcaddr;
+		pdcaddr = &dcaddr.u.ss;
 	}
 
 	ok = create_local_private_krb5_conf_for_domain(
@@ -384,7 +382,7 @@ static NTSTATUS idmap_ad_get_tldap_ctx(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
 	}
 
-	status = open_socket_out(&dcaddr, tcp_port, 10000, &fd);
+	status = open_socket_out(&dcaddr.u.ss, tcp_port, 10000, &fd);
 	if (!NT_STATUS_IS_OK(status)) {
 		DBG_DEBUG("open_socket_out failed: %s\n", nt_errstr(status));
 		TALLOC_FREE(dcinfo);
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 81013fcb099..a47ccfa19cd 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1443,13 +1443,15 @@ static bool connect_preferred_dc(TALLOC_CTX *mem_ctx,
 				return false;
 			}
 		} else {
+			struct samba_sockaddr dcaddr;
 			ok = resolve_name(saf_servername,
-					  &domain->dcaddr,
+					  &dcaddr,
 					  0x20,
 					  true);
 			if (!ok) {
 				goto fail;
 			}
+			domain->dcaddr = dcaddr.u.ss;
 		}
 
 		TALLOC_FREE(domain->dcname);