From c637c528762e5972bc47cc18f158186c670b4f7d Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Sun, 17 Jan 2010 22:50:31 +0300 Subject: provision: use message and do not display warning if the user choosed delibarately posix:eadb --- source4/setup/provision | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source4') diff --git a/source4/setup/provision b/source4/setup/provision index 26e28ccbd4..1ae52d2727 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -214,11 +214,12 @@ if opts.use_xattrs == "yes": elif opts.use_xattrs == "auto": file=tempfile.NamedTemporaryFile() try: - samba.ntacls.setntacl(lp,file.name,"O:S-1-5-32G:S-1-5-32","native") + samba.ntacls.setntacl(lp,file.name,"O:S-1-5-32G:S-1-5-32","S-1-5-32","native") eadb = False except: - print "Notice: you are not root or your system do not support xattr, tdb backend for attributes has been selected" - print " if you intend to use this provision in production you'd better rerun the script as root on a system supporting xattr" + if lp.get("posix:eadb") == None: + message("Notice: you are not root or your system do not support xattr, tdb backend for attributes has been selected") + message(" if you intend to use this provision in production you'd better rerun the script as root on a system supporting xattr") file.close() -- cgit