diff options
| author | Matthieu Patou <mat@matws.net> | 2010-02-20 10:51:25 +0300 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-03-01 03:20:36 +0100 |
| commit | 2bc3631db8546a44fb2bb29db8e380ea15c6441a (patch) | |
| tree | 1112bf4b05f03ddc9181e0384390e2e0310cbed5 | |
| parent | 5054bdb4f2008216f4591be9064002c3750474e4 (diff) | |
| download | samba-2bc3631db8546a44fb2bb29db8e380ea15c6441a.tar.gz samba-2bc3631db8546a44fb2bb29db8e380ea15c6441a.tar.bz2 samba-2bc3631db8546a44fb2bb29db8e380ea15c6441a.zip | |
upgrade provision: change the meaning of handle_security_desc to be similar to handle_special_case
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 531224cf2b..5fe71c4f04 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -216,14 +216,14 @@ def handle_security_desc(ischema, att, msgElt, hashallSD, old, new): hashSD["oldSD"] = old[0][att] hashSD["newSD"] = new[0][att] hashallSD[str(old[0].dn)] = hashSD - return 0 + return 1 if att == "nTSecurityDescriptor" and msgElt.flags() == FLAG_MOD_REPLACE: if ischema == 0: hashSD = {} hashSD["oldSD"] = ndr_unpack(security.descriptor, str(old[0][att])) hashSD["newSD"] = ndr_unpack(security.descriptor, str(new[0][att])) hashallSD[str(old[0].dn)] = hashSD - return 1 + return 0 return 0 # Handle special cases ... That's when we want to update a particular attribute @@ -547,7 +547,7 @@ def check_diff_name(newpaths, paths, creds, session, basedn, names, ischema): if att == "name": delta.remove(att) continue - if handle_security_desc(ischema,att,msgElt,hashallSD,current,reference): + if handle_security_desc(ischema,att,msgElt,hashallSD,current,reference) == 0: delta.remove(att) continue if (not hashOverwrittenAtt.has_key(att) or not (hashOverwrittenAtt.get(att)&2^msgElt.flags())): |