From: Andreas Schneider <asn@samba.org>
Date: Fri, 12 Apr 2024 05:37:09 +0000 (+0200)
Subject: s4:rpc_server: Use lpcfg_dns_hostname() in dnsutils.c
X-Git-Tag: tdb-1.4.11~589
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6bd56a2c19dbe6b7fcfde069cbf868b261b673ce;p=thirdparty%2Fsamba.git

s4:rpc_server: Use lpcfg_dns_hostname() in dnsutils.c

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/rpc_server/dnsserver/dnsutils.c b/source4/rpc_server/dnsserver/dnsutils.c
index 2c56946b0f6..891322fe3a8 100644
--- a/source4/rpc_server/dnsserver/dnsutils.c
+++ b/source4/rpc_server/dnsserver/dnsutils.c
@@ -114,6 +114,7 @@ struct dnsserver_serverinfo *dnsserver_init_serverinfo(TALLOC_CTX *mem_ctx,
 	struct dnsserver_serverinfo *serverinfo;
 	struct dcerpc_server_info *dinfo;
 	struct ldb_dn *domain_dn, *forest_dn;
+	const char *dns_hostname = NULL;
 
 	serverinfo = talloc_zero(mem_ctx, struct dnsserver_serverinfo);
 	if (serverinfo == NULL) {
@@ -135,9 +136,12 @@ struct dnsserver_serverinfo *dnsserver_init_serverinfo(TALLOC_CTX *mem_ctx,
 	serverinfo->fAllowUpdate = 1;
 	serverinfo->fDsAvailable = 1;
 
-	serverinfo->pszServerName = talloc_asprintf(mem_ctx, "%s.%s",
-					lpcfg_netbios_name(lp_ctx),
-					lpcfg_dnsdomain(lp_ctx));
+	dns_hostname = lpcfg_dns_hostname(lp_ctx);
+	if (dns_hostname == NULL) {
+		TALLOC_FREE(serverinfo);
+		return NULL;
+	}
+	serverinfo->pszServerName = discard_const_p(char, dns_hostname);
 
 	domain_dn = ldb_get_default_basedn(samdb);
 	forest_dn = ldb_get_root_basedn(samdb);