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

[kai/samba.git] / source4 / setup / provision

diff --git a/source4/setup/provision b/source4/setup/provision
index f254fa71133a2cb7259751d93bb32d2aa0839472..a0e58ec5150227909d914f10d3790f1aa99f26f9 100755 (executable)
--- 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,