summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-21 16:21:54 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-21 14:07:55 +0200
commit33ff033204c29adb669b3c93536fe4712428ec88 (patch)
tree7fb840b1fe078c305368d31c6a8a0d98230c8307 /source4
parent9e116e8a5e2c9ae834b7b500cb0833201bfd148b (diff)
downloadsamba-33ff033204c29adb669b3c93536fe4712428ec88.tar.gz
samba-33ff033204c29adb669b3c93536fe4712428ec88.tar.bz2
samba-33ff033204c29adb669b3c93536fe4712428ec88.zip
s4-provision: Give better clues on what Samba needs for s3fs ACL support
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Thu Jun 21 14:07:55 CEST 2012 on sn-devel-104
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/provision/__init__.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index c95db4e639..d9d1ce9eab 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1738,12 +1738,18 @@ def provision(logger, session_info, credentials, smbconf=None,
if paths.sysvol is None:
raise MissingShareError("sysvol", paths.smbconf)
+ if not smbd.have_posix_acls():
+ # This clue is only strictly correct for RPM and
+ # Debian-like Linux systems, but hopefully other users
+ # will get enough clue from it.
+ raise ProvisioningError("Samba was compiled without the posix ACL support that s3fs requires. Try installing libacl1-dev or libacl-devel, then re-run configure and make.")
+
file = tempfile.NamedTemporaryFile(dir=os.path.abspath(paths.sysvol))
try:
try:
smbd.set_simple_acl(file.name, root_uid, wheel_gid)
except Exception:
- raise ProvisioningError("Your filesystem or build does not support posix ACLs, s3fs is unworkable in this mode")
+ raise ProvisioningError("Your filesystem or build does not support posix ACLs, which s3fs requires. Try the mounting the filesystem with the 'acl' option.")
finally:
file.close()