From 1645190b1c0a4708cb3110bc94c1b9ec3e0d77e4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 Nov 2010 21:50:06 +1100 Subject: s4-provision: don't test for xattrs if posix:eadb is set when it is set in smb.conf or on the command line, obey the setting and don't try to test for system xattr support --- source4/scripting/python/samba/ntacls.py | 1 + source4/setup/provision | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source4/scripting/python/samba/ntacls.py b/source4/scripting/python/samba/ntacls.py index bccc7b6b72..9bf5cfe3d7 100644 --- a/source4/scripting/python/samba/ntacls.py +++ b/source4/scripting/python/samba/ntacls.py @@ -28,6 +28,7 @@ class XattrBackendError(Exception): def checkset_backend(lp, backend, eadbfile): + # if posix:eadb is set, then force the backend if backend is not None: if backend == "native": lp.set("posix:eadb", "") diff --git a/source4/setup/provision b/source4/setup/provision index 7fa676651e..303fd32f3b 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -218,7 +218,7 @@ elif opts.partitions_only: eadb = True if opts.use_xattrs == "yes": eadb = False -elif opts.use_xattrs == "auto" and lp.get("posix:eadb") is None: +elif opts.use_xattrs == "auto" and not lp.get("posix:eadb"): file = tempfile.NamedTemporaryFile() try: samba.ntacls.setntacl(lp, file.name, -- cgit