[PATCH 4/5] upgradeprovision: mark rIDAvailablePool never upgraded

[Matthieu Patou]

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

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 0a03915..212112d 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -54,6 +54,7 @@ from samba.dcerpc import misc, security
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.dcerpc.misc import SEC_CHAN_BDC
 
+never=0
 replace=2^ldb.FLAG_MOD_REPLACE
 add=2^ldb.FLAG_MOD_ADD
 delete=2^ldb.FLAG_MOD_DELETE
@@ -85,7 +86,8 @@ hashAttrNotCopied = { 	"dn": 1,"whenCreated": 1,"whenChanged": 1,"objectGUID": 1
 hashOverwrittenAtt = {	"prefixMap": replace, "systemMayContain": replace,"systemOnly":replace, "searchFlags":replace,
 						"mayContain":replace,  "systemFlags":replace,"description":replace,
 						"oEMInformation":replace, "operatingSystemVersion":replace, "adminPropertyPages":replace,
-						"defaultSecurityDescriptor": replace,"wellKnownObjects":replace,"privilege":delete,"groupType":replace}
+						"defaultSecurityDescriptor": replace,"wellKnownObjects":replace,"privilege":delete,"groupType":replace,
+						"rIDAvailablePool": never}
 
 
 backlinked = []
@@ -605,6 +607,9 @@ def check_diff_name(newpaths,paths,creds,session,basedn,names,ischema):
 				delta.remove(att)
 				continue
 			if (not hashOverwrittenAtt.has_key(att) or not (hashOverwrittenAtt.get(att)&2^msgElt.flags())):
+				if  hashOverwrittenAtt.has_key(att) and hashOverwrittenAtt.get(att)==never:
+					delta.remove(att)
+					continue
 				if  handle_special_case(att,delta,reference,current,ischema)==0 and msgElt.flags()!=ldb.FLAG_MOD_ADD:
 					i = 0
 					if opts.debugchange:
-- 
1.6.3.3


--------------030303070705040303000100
Content-Type: text/x-patch;
 name="0003-upgradeprovision-improve-info-messages.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0003-upgradeprovision-improve-info-messages.patch"