provision: use message and do not display warning if the user choosed delibarately...
authorMatthieu Patou <mat@matws.net>
Sun, 17 Jan 2010 19:50:31 +0000 (22:50 +0300)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 20 Jan 2010 18:11:17 +0000 (07:11 +1300)
source4/setup/provision

index 26e28ccbd45bdf7c663f9ddf22d3ecd6ace8d21e..1ae52d27277654cf16130f05caa92e9a9b1b323b 100755 (executable)
@@ -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()