sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-13 08:59:08 +03:00
Code Activity

s4-python: make checks of sacl in get_diff_sddls optionnal

Browse Source
This commit is contained in:
Matthieu Patou
2011-06-18 23:21:18 +04:00
committed by Matthieu Patou
parent c0eb403758
commit 7128345969
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source4/scripting/python/samba/upgradehelpers.py
View File

@ -360,7 +360,7 @@ def chunck_sddl(sddl):
return hash
def get_diff_sddls(refsddl, cursddl):
def get_diff_sddls(refsddl, cursddl, checkSacl = True):
"""Get the difference between 2 sddl
This function split the textual representation of ACL into smaller
@ -368,6 +368,7 @@ def get_diff_sddls(refsddl, cursddl):
:param refsddl: First sddl to compare
:param cursddl: Second sddl to compare
:param checkSacl: If false we skip the sacl checks
:return: A string that explain difference between sddls
"""
@ -387,7 +388,10 @@ def get_diff_sddls(refsddl, cursddl):
txt = "%s\tGroup mismatch: %s (in ref) %s" \
"(in current)\n" % (txt, hash_ref["group"], hash_cur["group"])
for part in ["dacl", "sacl"]:
parts = [ "dacl" ]
if checkSacl:
parts.append("sacl")
for part in parts:
if hash_cur.has_key(part) and hash_ref.has_key(part):
# both are present, check if they contain the same ACE