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

s4-upgradeprovisision: fix bug 8063, old SD can miss some componenent (group, owner, ...)

Browse Source 
Don't make the assumption that SD are correct, they can be wrong and
misformed.

Fix this bug: https://bugzilla.samba.org/show_bug.cgi?id=8063
This commit is contained in:
Matthieu Patou 2011-06-05 17:39:32 +04:00 committed by Matthieu Patou
parent b14bdf431b
commit 5db07d2f42
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,42 +372,46 @@ def get_diff_sddls(refsddl, cursddl):
""" """
txt = "" txt = ""
hash_new = chunck_sddl(cursddl) hash_cur = chunck_sddl(cursddl)
hash_ref = chunck_sddl(refsddl) hash_ref = chunck_sddl(refsddl)
if hash_new["owner"] != hash_ref["owner"]: if not hash_cur.has_key("owner"):
txt = "\tNo owner in current SD"
elif hash_cur["owner"] != hash_ref["owner"]:
txt = "\tOwner mismatch: %s (in ref) %s" \ txt = "\tOwner mismatch: %s (in ref) %s" \
"(in current)\n" % (hash_ref["owner"], hash_new["owner"]) "(in current)\n" % (hash_ref["owner"], hash_cur["owner"])
if hash_new["group"] != hash_ref["group"]: if not hash_cur.has_key("group"):
txt = "%s\tNo group in current SD" % txt
elif hash_cur["group"] != hash_ref["group"]:
txt = "%s\tGroup mismatch: %s (in ref) %s" \ txt = "%s\tGroup mismatch: %s (in ref) %s" \
"(in current)\n" % (txt, hash_ref["group"], hash_new["group"]) "(in current)\n" % (txt, hash_ref["group"], hash_cur["group"])
for part in ["dacl", "sacl"]: for part in ["dacl", "sacl"]:
if hash_new.has_key(part) and hash_ref.has_key(part): if hash_cur.has_key(part) and hash_ref.has_key(part):
# both are present, check if they contain the same ACE # both are present, check if they contain the same ACE
h_new = set() h_cur = set()
h_ref = set() h_ref = set()
c_new = chunck_acl(hash_new[part]) c_cur = chunck_acl(hash_cur[part])
c_ref = chunck_acl(hash_ref[part]) c_ref = chunck_acl(hash_ref[part])
for elem in c_new["aces"]: for elem in c_cur["aces"]:
h_new.add(elem) h_cur.add(elem)
for elem in c_ref["aces"]: for elem in c_ref["aces"]:
h_ref.add(elem) h_ref.add(elem)
for k in set(h_ref): for k in set(h_ref):
if k in h_new: if k in h_cur:
h_new.remove(k) h_cur.remove(k)
h_ref.remove(k) h_ref.remove(k)
if len(h_new) + len(h_ref) > 0: if len(h_cur) + len(h_ref) > 0:
txt = "%s\tPart %s is different between reference" \ txt = "%s\tPart %s is different between reference" \
" and current here is the detail:\n" % (txt, part) " and current here is the detail:\n" % (txt, part)
for item in h_new: for item in h_cur:
txt = "%s\t\t%s ACE is not present in the" \ txt = "%s\t\t%s ACE is not present in the" \
" reference\n" % (txt, item) " reference\n" % (txt, item)
@ -415,9 +419,9 @@ def get_diff_sddls(refsddl, cursddl):
txt = "%s\t\t%s ACE is not present in the" \ txt = "%s\t\t%s ACE is not present in the" \
" current\n" % (txt, item) " current\n" % (txt, item)
elif hash_new.has_key(part) and not hash_ref.has_key(part): elif hash_cur.has_key(part) and not hash_ref.has_key(part):
txt = "%s\tReference ACL hasn't a %s part\n" % (txt, part) txt = "%s\tReference ACL hasn't a %s part\n" % (txt, part)
elif not hash_new.has_key(part) and hash_ref.has_key(part): elif not hash_cur.has_key(part) and hash_ref.has_key(part):
txt = "%s\tCurrent ACL hasn't a %s part\n" % (txt, part) txt = "%s\tCurrent ACL hasn't a %s part\n" % (txt, part)
return txt return txt