sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-31 20:22:15 +03:00
Code Activity

More formatting fixes, pointed out by pylint.

Browse Source
This commit is contained in:
Jelmer Vernooij
2010-03-01 05:04:23 +01:00
parent 719cecba84
commit 86e2b25186
8 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source4/scripting/python/samba/ntacls.py
View File

@ -52,7 +52,7 @@ def getntacl(lp, file, backend=None, eadbfile=None):
ntacl = ndr_unpack(xattr.NTACL,attribute)
return ntacl
def setntacl(lp,file,sddl,domsid,backend=None,eadbfile=None):
def setntacl(lp, file, sddl, domsid, backend=None, eadbfile=None):
checkset_backend(lp,backend,eadbfile)
ntacl=xattr.NTACL()
ntacl.version = 1
@ -62,12 +62,12 @@ def setntacl(lp,file,sddl,domsid,backend=None,eadbfile=None):
eadbname = lp.get("posix:eadb")
if eadbname != None and eadbname != "":
try:
attribute = samba.xattr_tdb.wrap_setxattr(eadbname,file,xattr.XATTR_NTACL_NAME,ndr_pack(ntacl))
samba.xattr_tdb.wrap_setxattr(eadbname,file,xattr.XATTR_NTACL_NAME,ndr_pack(ntacl))
except:
print "Fail to open %s"%eadbname
attribute = samba.xattr_native.wrap_setxattr(file,xattr.XATTR_NTACL_NAME,ndr_pack(ntacl))
samba.xattr_native.wrap_setxattr(file,xattr.XATTR_NTACL_NAME,ndr_pack(ntacl))
else:
attribute = samba.xattr_native.wrap_setxattr(file,xattr.XATTR_NTACL_NAME,ndr_pack(ntacl))
samba.xattr_native.wrap_setxattr(file,xattr.XATTR_NTACL_NAME,ndr_pack(ntacl))
def ldapmask2filemask(ldm):
"""Takes the access mask of a DS ACE and transform them in a File ACE mask"""
@ -138,7 +138,7 @@ def dsacl2fsacl(dssddl, domsid):
fdescr.revision = ref.revision
fdescr.sacl = ref.sacl
aces = ref.dacl.aces
for i in range(0,len(aces)):
for i in range(0, len(aces)):
ace = aces[i]
if not ace.type & security.SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT and str(ace.trustee) != security.SID_BUILTIN_PREW2K:
# if fdescr.type & security.SEC_DESC_DACL_AUTO_INHERITED: