From ffc75c569c69ce22a39b5d1df8cb4906095c8654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= 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() Signed-off-by: Pavel Filipenský Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Wed Aug 21 00:04:19 UTC 2024 on atb-devel-224 --- 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 0afdcebb02d..ed5160d547b 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; } /***************************************************************************