From: Volker Lendecke <vl@samba.org>
Date: Sat, 13 Jun 2026 13:14:48 +0000 (+0200)
Subject: net: Fill in _nameserver.ss_s when -S has been given to net ads join
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296b18ebe9627cde0f0dbe98c5484bc16c3fea15;p=thirdparty%2Fsamba.git

net: Fill in _nameserver.ss_s when -S has been given to net ads join

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

diff --git a/source3/utils/net_ads_join_dns.c b/source3/utils/net_ads_join_dns.c
index e35635f2bd0..9473ab23dd3 100644
--- a/source3/utils/net_ads_join_dns.c
+++ b/source3/utils/net_ads_join_dns.c
@@ -26,6 +26,7 @@
 #include "passdb.h"
 #include "utils/net_dns.h"
 #include "lib/util/string_wrappers.h"
+#include "source3/libsmb/namequery.h"
 
 #ifdef HAVE_ADS
 
@@ -67,13 +68,22 @@ static NTSTATUS net_update_dns_internal(struct net_context *c,
 	dnsdomain++;
 
 	if (c->opt_host != NULL) {
-		/*
-		 * _nameserver.ss is not used
-		 * otherwise we would need
-		 * ads_dns_lookup_a and
-		 * ads_dns_lookup_aaaa here.
-		 */
+		bool ok;
+
 		_nameserver.hostname = c->opt_host;
+		_nameserver.ss_s = talloc(ctx, struct samba_sockaddr);
+		if (_nameserver.ss_s == NULL) {
+			status = NT_STATUS_NO_MEMORY;
+			goto done;
+		}
+
+		ok = resolve_name(c->opt_host, _nameserver.ss_s, 0x20, false);
+		if (!ok) {
+			DBG_WARNING("Host %s not found\n", c->opt_host);
+			status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
+			goto done;
+		}
+
 		nameservers = &_nameserver;
 		ns_count = 1;
 		goto do_update;