s4:lib/tls: let tstream_tls_params_server_lpcfg() use lpcfg_dns_hostname() internally

This is simpler and the next step will also make use of
lpcfg_additional_dns_hostnames() too...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15899

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index f7f55420c006377a58fb7985fd9f3ee0dad9752f..f31ea894600719f7a2cb7ea2be8e65a177b9307e 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -255,21 +255,13 @@ static NTSTATUS smb_parent_load_tls_certificates(struct smbd_parent_context *par
                                                 struct loadparm_context *lp_ctx)
 {
        struct tstream_tls_params *quic_tlsp = NULL;
-       const char *dns_hostname = NULL;
        NTSTATUS status;
 
        if (parent == NULL) {
                return NT_STATUS_INTERNAL_ERROR;
        }
 
-       dns_hostname = lpcfg_dns_hostname(lp_ctx);
-       if (dns_hostname == NULL) {
-               DBG_ERR("ERROR: lpcfg_dns_hostname() failed\n");
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
        status = tstream_tls_params_server_lpcfg(parent,
-                                                dns_hostname,
                                                 lp_ctx,
                                                 &quic_tlsp);
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index bc3d7cef883e729e505f9c73519ad8d0d24a87f9..ced56aafd83fd4df531af8afda261da5f566e355 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -1324,7 +1324,6 @@ static void ldap_reload_certs(struct imessaging_context *msg_ctx,
 
        /* reload certificates */
        status = tstream_tls_params_server_lpcfg(ldap_service,
-                                                ldap_service->dns_host_name,
                                                 ldap_service->lp_ctx,
                                                 &new_tls_params);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1432,18 +1431,9 @@ static NTSTATUS ldapsrv_task_init(struct task_server *task)
        ldap_service->current_ev = task->event_ctx;
        ldap_service->current_msg = task->msg_ctx;
 
-       ldap_service->dns_host_name = talloc_asprintf(ldap_service, "%s.%s",
-                                       lpcfg_netbios_name(task->lp_ctx),
-                                       lpcfg_dnsdomain(task->lp_ctx));
-       if (ldap_service->dns_host_name == NULL) {
-               status = NT_STATUS_NO_MEMORY;
-               goto failed;
-       }
-
        ldap_service->parent_pid = getpid();
 
        status = tstream_tls_params_server_lpcfg(ldap_service,
-                                                ldap_service->dns_host_name,
                                                 ldap_service->lp_ctx,
                                                 &ldap_service->tls_params);
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source4/ldap_server/ldap_server.h b/source4/ldap_server/ldap_server.h
index 4e833bea592f850229c864255252c76b658ba3b6..e47859d2b23c1c5786951c152abb142bf6e78326 100644 (file)
--- a/source4/ldap_server/ldap_server.h
+++ b/source4/ldap_server/ldap_server.h
@@ -115,7 +115,6 @@ struct ldapsrv_call {
 #define LDAP_SERVER_MAX_CHUNK_SIZE ((size_t)(25 * 1024 * 1024))
 
 struct ldapsrv_service {
-       const char *dns_host_name;
        pid_t parent_pid;
        struct tstream_tls_params *tls_params;
        struct tevent_queue *call_queue;

diff --git a/source4/lib/tls/tls.h b/source4/lib/tls/tls.h
index 2fc74f75c292f612a87806de52cee0a53fa85776..2e7515115e58f0a84fe1b578915968b3bf8fa464 100644 (file)
--- a/source4/lib/tls/tls.h
+++ b/source4/lib/tls/tls.h
@@ -84,7 +84,6 @@ NTSTATUS tstream_tls_params_server(TALLOC_CTX *mem_ctx,
                                   const char *tls_priority,
                                   struct tstream_tls_params **_params);
 NTSTATUS tstream_tls_params_server_lpcfg(TALLOC_CTX *mem_ctx,
-                                        const char *dns_host_name,
                                         struct loadparm_context *lp_ctx,
                                         struct tstream_tls_params **_params);
 

diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
index 1206bbdd58ecb2b25ff70d80fe476c9fbe67e0a6..298b76d2439b3517ae99766a8cec9e880aa56231 100644 (file)
--- a/source4/lib/tls/tls_tstream.c
+++ b/source4/lib/tls/tls_tstream.c
@@ -1680,7 +1680,6 @@ NTSTATUS tstream_tls_params_server(TALLOC_CTX *mem_ctx,
 }
 
 NTSTATUS tstream_tls_params_server_lpcfg(TALLOC_CTX *mem_ctx,
-                                        const char *dns_host_name,
                                         struct loadparm_context *lp_ctx,
                                         struct tstream_tls_params **_tlsp)
 {
@@ -1688,7 +1687,7 @@ NTSTATUS tstream_tls_params_server_lpcfg(TALLOC_CTX *mem_ctx,
        NTSTATUS status;
 
        status = tstream_tls_params_server(mem_ctx,
-                                          dns_host_name,
+                                          lpcfg_dns_hostname(lp_ctx),
                                           lpcfg_tls_enabled(lp_ctx),
                                           lpcfg_tls_keyfile(frame, lp_ctx),
                                           lpcfg_tls_certfile(frame, lp_ctx),