From 0615cf5f85ba2a4946a583c060af78fbe3e8cb4c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 19 Apr 2012 22:31:29 +1000 Subject: s4-provision: Always give the warning if we are using eadb. It really should be for testing only --- source4/setup/provision | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'source4/setup/provision') 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, -- cgit