Attachment 18416 Details for Bug 15698 – patch for v4-20-test

[patch] patch for v4-20-test

4.20-libparam.patch (text/plain), 1.79 KB, created by Pavel Filipenský on 2024-08-21 09:28:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Filipenský

Created: 2024-08-21 09:28:32 UTC

Size: 1.79 KB

patch

obsolete

>From b8567ef2e34d9f047bf6ff6bbd5684b834413a1e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
>Date: Tue, 20 Aug 2024 17:15:46 +0200
>Subject: [PATCH] lib/param: Don't treat a missing include file as an error in
> handle_include().
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Same fix as in commit 09d7690
>
>'samba-tool domain provision -d10' fails if the included file does not
>exist:
>
>lpcfg_load: refreshing parameters from /etc/samba/smb.conf
>Processing section "[global]"
>Can't find include file /etc/samba/usershares.conf
>pm_process() returned No
>ERROR: Unable to load default file
>  File "/usr/lib64/python3.12/site-packages/samba/netcmd/domain/provision.py", line 183, in run
>    lp = sambaopts.get_loadparm()
>         ^^^^^^^^^^^^^^^^^^^^^^^^
>  File "/usr/lib64/python3.12/site-packages/samba/getopt.py", line 282, in get_loadparm
>    self._lp.load_default()
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15698
>
>Signed-off-by: Pavel FilipenskÃ½ <pfilipensky@samba.org>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>
>Autobuild-User(master): Martin Schwenke <martins@samba.org>
>Autobuild-Date(master): Wed Aug 21 00:04:19 UTC 2024 on atb-devel-224
>
>(cherry picked from commit ffc75c569c69ce22a39b5d1df8cb4906095c8654)
>---
> lib/param/loadparm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
>index 6ef29ed9656..80753804dd8 100644
>--- a/lib/param/loadparm.c
>+++ b/lib/param/loadparm.c
>@@ -1132,7 +1132,7 @@ bool handle_include(struct loadparm_context *lp_ctx, struct loadparm_service *se
> 
> 	DEBUG(2, ("Can't find include file %s\n", fname));
> 
>-	return false;
>+	return true;
> }
> 
> /***************************************************************************
>-- 
>2.45.2
>

Flags:

asn: review+

Actions: View

Attachments on bug 15698: 18415 | 18416