The branch, v4-21-test has been updated
via 0d41094f130 lib/param: Don't treat a missing include file as an
error in handle_include().
from 851c488ea1c VERSION: Bump version up to Samba 4.21.0rc4...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-21-test
- Log -----------------------------------------------------------------
commit 0d41094f1304777f1c414de97b6d691983033913
Author: Pavel Filipenský <pfilipen...@samba.org>
Date: Tue Aug 20 17:15:46 2024 +0200
lib/param: Don't treat a missing include file as an error in
handle_include().
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ý <pfilipen...@samba.org>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
Autobuild-User(master): Martin Schwenke <mart...@samba.org>
Autobuild-Date(master): Wed Aug 21 00:04:19 UTC 2024 on atb-devel-224
(cherry picked from commit ffc75c569c69ce22a39b5d1df8cb4906095c8654)
Autobuild-User(v4-21-test): Jule Anger <jan...@samba.org>
Autobuild-Date(v4-21-test): Wed Aug 21 11:19:48 UTC 2024 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
lib/param/loadparm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
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;
}
/***************************************************************************
--
Samba Shared Repository
