[PATCH 2/4] s4: don't forget to update defaultSecurityDescriptor

[Matthieu Patou]

---
 source4/scripting/bin/upgradeprovision |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 486bad1..38bc092 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):
@@ -342,11 +343,12 @@ def dn_sort(x,y):
 # it also populate hash structure for later use in the upgrade process
 def handle_security_desc(ischema,att,msgElt,hashallSD,old,new):
 	if ischema == 1 and att == "defaultSecurityDescriptor"  and msgElt.flags() == ldb.FLAG_MOD_REPLACE:
+		print "coin coin"
 		hashSD = {}
 		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 = {}
-- 
1.6.3.3


--------------030405010102080307060500--