From 1d0d819eb890c13b44b4e59893f6068f56c98bce Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 26 Apr 2022 16:14:38 +0300 Subject: [PATCH] testparm: do not fail if /run/samba does not exist testparm explicitly fails if $piddir or $lockdir does not exist. However, the daemons which actually use these directories, will create it on demand, there is no need to fail even simple testparm operations if the dirs are not there. This change lets to (pre)configure samba without bothering to pre-create the directories which are overwise needed only to fulfil testparm criteria. Signed-off-by: Michael Tokarev Gbp-Pq: Name testparm-do-not-fail-if-pid-dir-does-not-exist.patch --- python/samba/netcmd/testparm.py | 6 ++---- source3/utils/testparm.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/python/samba/netcmd/testparm.py b/python/samba/netcmd/testparm.py index 41dbb4bd..02e52ffc 100644 --- a/python/samba/netcmd/testparm.py +++ b/python/samba/netcmd/testparm.py @@ -145,14 +145,12 @@ class cmd_testparm(Command): lockdir = lp.get("lockdir") if not os.path.isdir(lockdir): - logger.error("lock directory %s does not exist", lockdir) - valid = False + logger.warning("lock directory %s does not exist", lockdir) piddir = lp.get("pid directory") if not os.path.isdir(piddir): - logger.error("pid directory %s does not exist", piddir) - valid = False + logger.warning("pid directory %s does not exist", piddir) winbind_separator = lp.get("winbind separator") diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index fd90e8d7..51d2681b 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -343,9 +343,8 @@ static int do_global_checks(void) } if (!directory_exist_stat(lp_lock_directory(), &st)) { - fprintf(stderr, "ERROR: lock directory %s does not exist\n\n", + fprintf(stderr, "WARNING: lock directory %s does not exist\n\n", lp_lock_directory()); - ret = 1; } else if ((st.st_ex_mode & 0777) != 0755) { fprintf(stderr, "WARNING: lock directory %s should have " "permissions 0755 for browsing to work\n\n", @@ -373,9 +372,8 @@ static int do_global_checks(void) } if (!directory_exist_stat(lp_pid_directory(), &st)) { - fprintf(stderr, "ERROR: pid directory %s does not exist\n\n", + fprintf(stderr, "WARNING: pid directory %s does not exist\n\n", lp_pid_directory()); - ret = 1; } if (lp_passdb_expand_explicit()) { -- 2.30.2