domain.py: Remove tab characters.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 12 Sep 2011 22:19:51 +0000 (00:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 13 Sep 2011 00:24:03 +0000 (02:24 +0200)
source4/scripting/python/samba/netcmd/domain.py

index c3117481def441f64e11c3064e49f8dd66a43041..b8f5561552f6be7cad19153811cdba76c4310d7f 100644 (file)
@@ -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 = {}