]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:rpc_server: Use lpcfg_dns_hostname() in dnsutils.c
authorAndreas Schneider <asn@samba.org>
Fri, 12 Apr 2024 05:37:09 +0000 (07:37 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 22 May 2024 20:33:36 +0000 (20:33 +0000)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/rpc_server/dnsserver/dnsutils.c

index 2c56946b0f67499aa44497bc25211d01c14820e9..891322fe3a8e540d7c9ec09b70d394aef3a471d0 100644 (file)
@@ -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);