Attachment 17139 Details for Bug 14961 – Patch for 4.16 cherry-picked from master

[patch] Patch for 4.16 cherry-picked from master

bug14961-v416.patch (text/plain), 1.66 KB, created by Ralph Böhme on 2022-01-31 14:10:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2022-01-31 14:10:49 UTC

Size: 1.66 KB

patch

obsolete

>From 8b46948522936189ac721b948069c5357b8375aa Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Thu, 27 Jan 2022 12:06:55 +0100
>Subject: [PATCH] s3/rpc_server: install elasticsearch_mappings.json
>
>This was removed accidentally remvoed by
>a7c65958a15149918415b7456d6f20ee8c9669d2 because the original code
>only installed the json file if the mdssvc was built as module:
>
>     if bld.SAMBA3_IS_ENABLED_MODULE('rpc_mdssvc_module'):
>         bld.INSTALL_FILES(bld.env.SAMBA_DATADIR,
>                           'mdssvc/elasticsearch_mappings.json')
>
>Installing the json file should just depend on Elasticsearch support
>being enabled, regardless of the removed module support.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14961
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Noel Power <npower@samba.org>
>
>Autobuild-User(master): Noel Power <npower@samba.org>
>Autobuild-Date(master): Fri Jan 28 10:22:31 UTC 2022 on sn-devel-184
>
>(cherry picked from commit 0eecfddd071ea54844c56516dd7adc761be03c27)
>---
> source3/rpc_server/wscript_build | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
>index 04ff3424d475..83ceca2a45ca 100644
>--- a/source3/rpc_server/wscript_build
>+++ b/source3/rpc_server/wscript_build
>@@ -250,6 +250,9 @@ rpc_mdssvc_deps = 'mdssvc samba-util smbd_base '
>                           '''
>     rpc_mdssvc_deps += ' http jansson'
> 
>+    bld.INSTALL_FILES(bld.env.SAMBA_DATADIR,
>+                      'mdssvc/elasticsearch_mappings.json')
>+
> bld.SAMBA3_BINARY('rpcd_mdssvc',
>                   source='rpcd_mdssvc.c ' + rpc_mdssvc_sources,
>                   deps='''
>-- 
>2.34.1
>

Flags:

metze: review+

Actions: View

Attachments on bug 14961: 17139