diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2011-09-13 00:19:51 +0200 | 
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2011-09-13 02:24:03 +0200 | 
| commit | 4c7acab5fc700c53381b52edd430c9c319b6ea50 (patch) | |
| tree | 567c5199e579114afc44fbbec69af9b87eeea824 /source4/scripting/python | |
| parent | dc26067a6f73d20fda65cc2996a0c6c156d4d5b0 (diff) | |
| download | samba-4c7acab5fc700c53381b52edd430c9c319b6ea50.tar.gz samba-4c7acab5fc700c53381b52edd430c9c319b6ea50.tar.bz2 samba-4c7acab5fc700c53381b52edd430c9c319b6ea50.zip | |
domain.py: Remove tab characters.
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/netcmd/domain.py | 25 | 
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 = {} | 
