[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  6d9c072... ntacl: Use existing infrastructure.
      from  da96d3f... Remove __contains__ from mock object for consistency with actual implementation.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6d9c0724a6dbc8afc736e64a11d4aed0de5776f5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Mar 1 04:39:53 2010 +0100

    ntacl: Use existing infrastructure.

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/samba/netcmd/__init__.py |    2 +-
 source4/scripting/python/samba/netcmd/ntacl.py    |   52 ++++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py
index 09c8cc3..df0154e 100644
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -18,7 +18,7 @@
 #
 
 import optparse
-from samba import getopt as options, Ldb
+from samba import getopt as options
 import sys
 
 
diff --git a/source4/scripting/python/samba/netcmd/ntacl.py b/source4/scripting/python/samba/netcmd/ntacl.py
index 8c0803f..9b25ca2 100644
--- a/source4/scripting/python/samba/netcmd/ntacl.py
+++ b/source4/scripting/python/samba/netcmd/ntacl.py
@@ -26,15 +26,13 @@ from samba import Ldb
 from samba.ndr import ndr_unpack
 
 from ldb import SCOPE_BASE
-import ldb
 import os
-import sys
 
 from samba.auth import system_session
 from samba.netcmd import (
     Command,
-	SuperCommand,
     CommandError,
+    SuperCommand,
     Option,
     )
 
@@ -53,31 +51,33 @@ class cmd_acl_set(Command):
         Option("--xattr-backend", type="choice", help="xattr backend type (native fs or tdb)",
                choices=["native","tdb"]),
         Option("--eadb-file", help="Name of the tdb file where attributes are stored", type="string"),
-		]
+        ]
 
     takes_args = ["acl","file"]
 
     def run(self, acl, file, quiet=False,xattr_backend=None,eadb_file=None,
             credopts=None, sambaopts=None, versionopts=None):
-		lp = sambaopts.get_loadparm()
-		creds = credopts.get_credentials(lp)
-		path = os.path.join(lp.get("private dir"), lp.get("secrets database") or "secrets.ldb")
-		creds = credopts.get_credentials(lp)
-		creds.set_kerberos_state(DONT_USE_KERBEROS)
-		try:
-			ldb = Ldb(path, session_info=system_session(), credentials=creds,lp=lp)
-		except:
-			print "Unable to read domain SID from configuration files"
-			sys.exit(1)
-		attrs = ["objectSid"]
-		print lp.get("realm")
-		res = ldb.search(expression="(objectClass=*)",base="flatname=%s,cn=Primary Domains"%lp.get("workgroup"), scope=SCOPE_BASE, attrs=attrs)
-		if len(res) !=0:
-			domainsid = ndr_unpack( security.dom_sid,res[0]["objectSid"][0])
-			setntacl(lp,file,acl,str(domainsid),xattr_backend,eadb_file)
-		else:
-			print "Unable to read domain SID from configuration files"
-			sys.exit(1)
+        lp = sambaopts.get_loadparm()
+        creds = credopts.get_credentials(lp)
+        path = os.path.join(lp.get("private dir"), lp.get("secrets database") or "secrets.ldb")
+        creds = credopts.get_credentials(lp)
+        creds.set_kerberos_state(DONT_USE_KERBEROS)
+        try:
+            ldb = Ldb(path, session_info=system_session(), credentials=creds,lp=lp)
+        except:
+            # XXX: Should catch a particular exception type
+            raise CommandError("Unable to read domain SID from configuration files")
+        attrs = ["objectSid"]
+        print lp.get("realm")
+        res = ldb.search(expression="(objectClass=*)",
+            base="flatname=%s,cn=Primary Domains" % lp.get("workgroup"),
+            scope=SCOPE_BASE, attrs=attrs)
+        if len(res) !=0:
+            domainsid = ndr_unpack(security.dom_sid, res[0]["objectSid"][0])
+            setntacl(lp, file, acl, str(domainsid), xattr_backend, eadb_file)
+        else:
+            raise CommandError("Unable to read domain SID from configuration files")
+
 
 class cmd_acl_get(Command):
     """Set ACLs on a file"""
@@ -98,13 +98,13 @@ class cmd_acl_get(Command):
 
     takes_args = ["file"]
 
-    def run(self, file, as_sddl=False,xattr_backend=None,eadb_file=None,
+    def run(self, file, as_sddl=False, xattr_backend=None, eadb_file=None,
             credopts=None, sambaopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp)
-	acl = getntacl(lp,file,xattr_backend,eadb_file)
+        acl = getntacl(lp, file, xattr_backend, eadb_file)
         if as_sddl:
-            anysid=security.dom_sid(security.SID_NT_SELF)
+            anysid = security.dom_sid(security.SID_NT_SELF)
             print acl.info.as_sddl(anysid)
         else:
             acl.dump()


-- 
Samba Shared Repository