summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/scripting/python/samba/netcmd/domain.py25
1 files changed, 13 insertions, 12 deletions
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index c3117481de..b8f5561552 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -568,9 +568,9 @@ samba3 testparm utility (with --testparm)."""
logger = logging.getLogger("upgrade")
logger.addHandler(logging.StreamHandler(sys.stdout))
if quiet:
- logger.setLevel(logging.WARNING)
+ logger.setLevel(logging.WARNING)
else:
- logger.setLevel(logging.INFO)
+ logger.setLevel(logging.INFO)
lp = sambaopts.get_loadparm()
realm = lp.get("realm")
@@ -582,17 +582,18 @@ samba3 testparm utility (with --testparm)."""
eadb = True
if use_xattrs == "yes":
- eadb = False
+ eadb = False
elif use_xattrs == "auto" and not s3conf.get("posix:eadb"):
- tmpfile = tempfile.NamedTemporaryFile()
- try:
- samba.ntacls.setntacl(lp, tmpfile.name,
- "O:S-1-5-32G:S-1-5-32", "S-1-5-32", "native")
- eadb = False
- except:
- 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.")
- tmpfile.close()
+ tmpfile = tempfile.NamedTemporaryFile()
+ try:
+ samba.ntacls.setntacl(lp, tmpfile.name,
+ "O:S-1-5-32G:S-1-5-32", "S-1-5-32", "native")
+ eadb = False
+ except:
+ # FIXME: Don't catch all exceptions here
+ 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.")
+ tmpfile.close()
# Set correct default values from libdir or testparm
paths = {}