sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

domain.py: Remove tab characters.

Browse Source
This commit is contained in:
Jelmer Vernooij 2011-09-13 00:19:51 +02:00
parent dc26067a6f
commit 4c7acab5fc
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source4/scripting/python/samba/netcmd/domain.py
View 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 = {}