[PATCH 3/7] upgrade provision: change the meaning of handle_security_desc to be similar to handle_special_case

[Matthieu Patou]

---
 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 531224c..5fe71c4 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())):
-- 
1.6.3.3


--------------040502050402080101070707
Content-Type: text/x-patch;
 name="0005-upgradeprovision-Move-to-pythondoc-format.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0005-upgradeprovision-Move-to-pythondoc-format.patch"