[SCM] Samba Shared Repository - branch v4-12-test updated
Karolin Seeger
kseeger at samba.org
Thu Feb 20 12:59:03 UTC 2020
The branch, v4-12-test has been updated
via 537acf2a185 build: Do not check if system perl modules should be bundled
via da44630885e pidl/wscript: configure should insist on Parse::Yapp::Driver
via 339566feb72 s3: DFS: Don't allow link deletion on a read-only share.
via 5a794f3bf8c s3: DFS: Don't allow link creation on a read-only share.
from f72bb650ec3 VERSION: Bump version up to 4.12.0rc4...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-12-test
- Log -----------------------------------------------------------------
commit 537acf2a185c7b8ee76c7a55cb9d9dad6417d153
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Feb 3 09:51:12 2020 +1300
build: Do not check if system perl modules should be bundled
We do not ship any perl modules in third_party at this time, so
this check is pointless and breaks the build for --bundled-libraries=ALL.
As reported by aaptel on https://gitlab.com/samba-team/samba/-/merge_requests/1104#note_281050331
This changes our autobuild script to cover this case in the
samba-static job.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14284
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
(cherry picked from commit cf4984947b39e9f6f8afd29de8a760703bf9e092)
Autobuild-User(v4-12-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-12-test): Thu Feb 20 12:58:46 UTC 2020 on sn-devel-184
commit da44630885eb51f54c4814dcac1c94f11a149642
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sun Feb 2 16:05:38 2020 +1300
pidl/wscript: configure should insist on Parse::Yapp::Driver
following 83ffe6752d589180eac96d7b8e7d1a54e3476bfd, you get a build
error if you lack a system perl Parse::Yapp. Let's make it a configure
failure instead.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14284
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Sun Feb 2 10:09:11 UTC 2020 on sn-devel-184
(cherry picked from commit af47a77673f58cc6436798b250c90be0e325d20e)
commit 339566feb72edc3b1fc39d2c7fb5bf05c11a88a5
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 6 16:20:59 2020 -0800
s3: DFS: Don't allow link deletion on a read-only share.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14269
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
(cherry picked from commit 0450593e38d62fe0b925d789486517ade31fe3c6)
commit 5a794f3bf8cfae04fab8ef2e5136ee470d8fa60e
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 6 15:55:13 2020 -0800
s3: DFS: Don't allow link creation on a read-only share.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14269
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
(cherry picked from commit b4195cd488e1366887acfea6ae03bf4198514a15)
-----------------------------------------------------------------------
Summary of changes:
pidl/wscript | 17 +++++++----------
script/autobuild.py | 2 +-
source3/smbd/msdfs.c | 21 +++++++++++++++++++++
3 files changed, 29 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/wscript b/pidl/wscript
index d1b8278990a..50fe12c013d 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -2,27 +2,20 @@
import os, string
from samba_utils import MODE_755
-from waflib import Logs
+from waflib import Logs, Errors
# This function checks if a perl module is installed on the system.
def check_system_perl_module(conf, module, version=None):
- bundle_name = module.replace('::', '_')
module_check = module
# Create module string with version
if version:
module_check = module + ' ' + str(version)
- # Check if we have to bundle it.
- if conf.LIB_MUST_BE_BUNDLED(bundle_name.lower()):
- return False
-
# Check for system perl module
if conf.check_perl_module(module_check) is None:
return False
- conf.define('USING_SYSTEM_%s' % bundle_name.upper(), 1)
-
return True
def options(opt):
@@ -30,10 +23,14 @@ def options(opt):
def configure(conf):
# Check if perl(Parse::Yapp::Driver) is available.
- check_system_perl_module(conf, "Parse::Yapp::Driver", 1.05)
+ if not check_system_perl_module(conf,
+ "Parse::Yapp::Driver",
+ 1.05):
+ raise Errors.WafError('perl module "Parse::Yapp::Driver" not found')
# yapp is used for building the parser
- conf.find_program('yapp', var='YAPP')
+ if not conf.find_program('yapp', var='YAPP'):
+ raise Errors.WafError('yapp not found')
def build(bld):
diff --git a/script/autobuild.py b/script/autobuild.py
index 2a0b7da53e5..f5cf2a85ca0 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -623,7 +623,7 @@ tasks = {
# retry with nonshared smbd and smbtorture
("nonshared-distclean", "make distclean"),
- ("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=talloc,tdb,pytdb,ldb,pyldb,tevent,pytevent --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd"),
+ ("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd"),
("nonshared-make", "make -j")
],
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index c5643824e20..cc32ebc9d29 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -1396,6 +1396,16 @@ bool create_msdfs_link(const struct junction_map *jucn,
goto out;
}
+ if (!CAN_WRITE(conn)) {
+ const struct loadparm_substitution *lp_sub =
+ loadparm_s3_global_substitution();
+ int snum = lp_servicenumber(jucn->service_name);
+
+ DBG_WARNING("Can't create DFS entry on read-only share %s\n",
+ lp_servicename(frame, lp_sub, snum));
+ goto out;
+ }
+
smb_fname = synthetic_smb_fname(frame,
path,
NULL,
@@ -1458,6 +1468,17 @@ bool remove_msdfs_link(const struct junction_map *jucn,
return false;
}
+ if (!CAN_WRITE(conn)) {
+ const struct loadparm_substitution *lp_sub =
+ loadparm_s3_global_substitution();
+ int snum = lp_servicenumber(jucn->service_name);
+
+ DBG_WARNING("Can't remove DFS entry on read-only share %s\n",
+ lp_servicename(frame, lp_sub, snum));
+ TALLOC_FREE(frame);
+ return false;
+ }
+
smb_fname = synthetic_smb_fname(frame,
path,
NULL,
--
Samba Shared Repository
More information about the samba-cvs
mailing list