summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-04-19 22:31:29 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-04-19 19:15:05 +0200
commit0615cf5f85ba2a4946a583c060af78fbe3e8cb4c (patch)
tree496faf31c0f1e1d4bb20fd564adba3b16923c369
parente58f03c91a6a01a690e4bb0909f6467036add2eb (diff)
downloadsamba-0615cf5f85ba2a4946a583c060af78fbe3e8cb4c.tar.gz
samba-0615cf5f85ba2a4946a583c060af78fbe3e8cb4c.tar.bz2
samba-0615cf5f85ba2a4946a583c060af78fbe3e8cb4c.zip
s4-provision: Always give the warning if we are using eadb. It really should be for testing only
-rwxr-xr-xsource4/setup/provision9
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/setup/provision b/source4/setup/provision
index f254fa7113..a0e58ec515 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -221,6 +221,7 @@ if opts.targetdir is not None:
os.mkdir(opts.targetdir)
eadb = True
+
if opts.use_xattrs == "yes":
eadb = False
elif opts.use_xattrs == "auto" and not lp.get("posix:eadb"):
@@ -231,14 +232,16 @@ elif opts.use_xattrs == "auto" and not lp.get("posix:eadb"):
try:
try:
samba.ntacls.setntacl(lp, file.name,
- "O:S-1-5-32G:S-1-5-32", "S-1-5-32", "native")
+ "O:S-1-5-32G:S-1-5-32", "S-1-5-32", "native")
eadb = False
except Exception:
- logger.info("You are not root or your system do not support xattr, using tdb backend for attributes. "
- "If you intend to use this provision in production, rerun the script as root on a system supporting xattrs.")
+ logger.info("You are not root or your system do not support xattr, using tdb backend for attributes. ")
finally:
file.close()
+if eadb:
+ logger.info("not using extended attributes to store ACLs and other metadata. If you intend to use this provision in production, rerun the script as root on a system supporting xattrs.")
+
session = system_session()
try:
result = provision(logger,