[SCM] Samba Shared Repository - branch v4-20-test updated
Jule Anger
janger at samba.org
Thu Aug 22 09:02:02 UTC 2024
The branch, v4-20-test has been updated
via cccf0beb9f8 lib/param: Don't treat a missing include file as an error in handle_include().
from 0bd26677e65 s3:smb2_server: return NT_STATUS_NETWORK_SESSION_EXPIRED for compound requests
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-20-test
- Log -----------------------------------------------------------------
commit cccf0beb9f897a0b9508b45118512fbb373e7da4
Author: Pavel Filipenský <pfilipensky at 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ý <pfilipensky at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
Autobuild-User(master): Martin Schwenke <martins at 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-20-test): Jule Anger <janger at samba.org>
Autobuild-Date(v4-20-test): Thu Aug 22 09:01:31 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 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;
}
/***************************************************************************
--
Samba Shared Repository
More information about the samba-cvs
mailing list