[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: Fix patch testparm-do-not-fail-if-pid-dir-does-not-exist (#1010835)

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
c31089e0 by Arnaud Rebillout at 2022-05-11T13:34:52+07:00
Fix patch testparm-do-not-fail-if-pid-dir-does-not-exist (#1010835)

- - - - -
35e78b39 by Michael Tokarev at 2022-05-11T06:47:46+00:00
Merge branch 'fix-testparm-patch' into 'master'

Fix patch testparm-do-not-fail-if-pid-dir-does-not-exist

See merge request samba-team/samba!57
- - - - -


1 changed file:

- debian/patches/testparm-do-not-fail-if-pid-dir-does-not-exist.patch


Changes:

=====================================
debian/patches/testparm-do-not-fail-if-pid-dir-does-not-exist.patch
=====================================
@@ -6,11 +6,20 @@ https://lists.samba.org/archive/samba-technical/2022-April/137320.html
 
 We now can remove the tempfiles creation of /run/samba
 
-diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
-index 2d717f19756..6d6e462d084 100644
 --- a/source3/utils/testparm.c
 +++ b/source3/utils/testparm.c
-@@ -283,9 +283,8 @@ static int do_global_checks(void)
+@@ -326,9 +326,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",
+@@ -356,9 +355,8 @@ static int do_global_checks(void)
  	}
  
  	if (!directory_exist_stat(lp_pid_directory(), &st)) {



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/a04fc26e82cfd390679c4c4e1d7075aa1664e5ca...35e78b39cf70f184a05d2d50616783187a0d18a7

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/a04fc26e82cfd390679c4c4e1d7075aa1664e5ca...35e78b39cf70f184a05d2d50616783187a0d18a7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20220511/c647c168/attachment-0001.htm>