summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2009-11-29 02:28:26 +0300
committerAndrew Bartlett <abartlet@samba.org>2009-12-01 12:17:41 +1100
commit4861ad57fb533dbb060faa0a0630f8d8afe87421 (patch)
treeb5daae1f85862c51d338f93a4eb3a6783c0ee489 /source4
parentbf2c1e9c4f6fa7d1ea778f54593c308b56efacd2 (diff)
downloadsamba-4861ad57fb533dbb060faa0a0630f8d8afe87421.tar.gz
samba-4861ad57fb533dbb060faa0a0630f8d8afe87421.tar.bz2
samba-4861ad57fb533dbb060faa0a0630f8d8afe87421.zip
s4: don't forget to update defaultSecurityDescriptor
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/scripting/bin/upgradeprovision5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 9eb3ba3a98..c8fad206d7 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -79,7 +79,8 @@ hashAttrNotCopied = { "dn": 1,"whenCreated": 1,"whenChanged": 1,"objectGUID": 1
# reasons. Anyway for a few of thems it's mandatory to replace them otherwise the provision will be broken somehow.
hashOverwrittenAtt = { "prefixMap": replace, "systemMayContain": replace,"systemOnly":replace, "searchFlags":replace,\
"mayContain":replace, "systemFlags":replace,
- "oEMInformation":replace, "operatingSystemVersion":replace, "adminPropertyPages":1,"possibleInferiors":replace+delete}
+ "oEMInformation":replace, "operatingSystemVersion":replace, "adminPropertyPages":replace,
+ "defaultSecurityDescriptor": replace}
backlinked = []
def define_what_to_log(opts):
@@ -346,7 +347,7 @@ 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 1
+ return 0
if att == "nTSecurityDescriptor" and msgElt.flags() == ldb.FLAG_MOD_REPLACE:
if ischema == 0:
hashSD = {}