diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-17 21:50:06 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-17 23:55:39 +1100 |
| commit | 1645190b1c0a4708cb3110bc94c1b9ec3e0d77e4 (patch) | |
| tree | 64506573c30e6c0650374451519d75c96a93e1b5 | |
| parent | 333975d84f1f5016ad8d61c8107ef76e43af0c7e (diff) | |
| download | samba-1645190b1c0a4708cb3110bc94c1b9ec3e0d77e4.tar.gz samba-1645190b1c0a4708cb3110bc94c1b9ec3e0d77e4.tar.bz2 samba-1645190b1c0a4708cb3110bc94c1b9ec3e0d77e4.zip | |
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
| -rw-r--r-- | source4/scripting/python/samba/ntacls.py | 1 | ||||
| -rwxr-xr-x | source4/setup/provision | 2 |
2 files changed, 2 insertions, 1 deletions
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, |