Attachment 18734 Details for Bug 15920 – v4.23 patch

[patch] v4.23 patch

0001-Fix-crash-in-DLZ-plugin-for-incorrect-setup.patch (text/plain), 1.88 KB, created by Douglas Bagnall on 2025-09-23 21:00:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Bagnall

Created: 2025-09-23 21:00:11 UTC

Size: 1.88 KB

patch

obsolete

>From 5d2bbb19c5c59ad4c2cf2c16800463295303cbf1 Mon Sep 17 00:00:00 2001
>From: Alexander Bokovoy <ab@samba.org>
>Date: Fri, 19 Sep 2025 16:23:41 +0300
>Subject: [PATCH] Fix crash in DLZ plugin for incorrect setup
>
>When bind is not yet setup properly, logging errors should be done
>through the temporary handle.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15920
>
>Signed-off-by: Alexander Bokovoy <ab@samba.org>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>
>Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
>Autobuild-Date(master): Sat Sep 20 06:49:37 UTC 2025 on atb-devel-224
>
>(cherry picked from commit 821cf798d87162b1f3b5d7388891d15fea0a969a)
>---
> source4/dns_server/dlz_bind9.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
>diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
>index e5c9679835e..2a2430caba2 100644
>--- a/source4/dns_server/dlz_bind9.c
>+++ b/source4/dns_server/dlz_bind9.c
>@@ -671,6 +671,9 @@ _PUBLIC_ isc_result_t dlz_create(const char *dlzname,
> 	}
> 	va_end(ap);
> 
>+	/* starting from here, we can only use state->log() until
>+	 * dlz_bind9_state is assigned */
>+
> 	/* Do not install samba signal handlers */
> 	fault_setup_disable();
> 
>@@ -727,11 +730,11 @@ _PUBLIC_ isc_result_t dlz_create(const char *dlzname,
> 		}
> 
> 		if (!file_exist(state->options.url)) {
>-			dlz_bind9_state->log(ISC_LOG_ERROR,
>-					     "samba_dlz: dlz_create could not find '%s'; "
>-					     "trying old location '%s/dns/sam.ldb' instead",
>-					     state->options.url,
>-					     lpcfg_private_dir(state->lp));
>+			state->log(ISC_LOG_ERROR,
>+				   "samba_dlz: dlz_create could not find '%s'; "
>+				   "trying old location '%s/dns/sam.ldb' instead",
>+				   state->options.url,
>+				   lpcfg_private_dir(state->lp));
> 			state->options.url = talloc_asprintf(state,
> 							     "%s/dns/sam.ldb",
> 							     lpcfg_private_dir(state->lp));
>-- 
>2.43.0
>

Flags:

ab: review+

Actions: View

Attachments on bug 15920: 18734