Attachment 18791 Details for Bug 15959 – Patch for 4.22 and 4.23 backported from master

[patch] Patch for 4.22 and 4.23 backported from master

bug15959-v422,v423.patch (text/plain), 1.63 KB, created by Ralph Böhme on 2026-01-05 13:59:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2026-01-05 13:59:30 UTC

Size: 1.63 KB

patch

obsolete

>From 4892cb8c7e537248707d790632ae733ad61dd2e1 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Fri, 21 Nov 2025 11:12:13 +0100
>Subject: [PATCH] mdssvc: make a copy of the elasticsearch:default_fields
>
>lp_parm_const_string() returns a pointer to loadparm state that is not stable
>across loadparm reloads and hence may later point at random garbage.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15959
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Tue Dec 16 18:58:07 UTC 2025 on atb-devel-224
>
>(cherry picked from commit 5f8125665cb2ccad12678f95d20cae09922b3767)
>---
> source3/rpc_server/mdssvc/mdssvc_es.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/source3/rpc_server/mdssvc/mdssvc_es.c b/source3/rpc_server/mdssvc/mdssvc_es.c
>index eb19d5fdc4a1..59f91271e59b 100644
>--- a/source3/rpc_server/mdssvc/mdssvc_es.c
>+++ b/source3/rpc_server/mdssvc/mdssvc_es.c
>@@ -108,10 +108,12 @@ static bool mdssvc_es_init(struct mdssvc_ctx *mdssvc_ctx)
> 	}
> 	TALLOC_FREE(default_path);
> 
>-	mdssvc_es_ctx->default_fields = lp_parm_const_string(GLOBAL_SECTION_SNUM,
>-							     "elasticsearch",
>-							     "default_fields",
>-							     default_fields);
>+	default_fields = lp_parm_const_string(GLOBAL_SECTION_SNUM,
>+					      "elasticsearch",
>+					      "default_fields",
>+					      default_fields);
>+	mdssvc_es_ctx->default_fields = talloc_strdup(mdssvc_es_ctx,
>+						      default_fields);
> 	if (mdssvc_es_ctx->default_fields == NULL) {
> 		TALLOC_FREE(mdssvc_es_ctx);
> 		return false;
>-- 
>2.50.0
>

Flags:

vl: review+

Actions: View

Attachments on bug 15959: 18791