From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 19 Apr 2012 12:31:29 +0000 (+1000)
Subject: s4-provision: Always give the warning if we are using eadb.  It really should be... 
X-Git-Tag: samba-4.0.0alpha20~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0615cf5f85ba2a4946a583c060af78fbe3e8cb4c;p=thirdparty%2Fsamba.git

s4-provision: Always give the warning if we are using eadb.  It really should be for testing only
---

diff --git a/source4/setup/provision b/source4/setup/provision
index f254fa71133..a0e58ec5150 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,