summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-13 12:33:26 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-13 12:33:26 +0100
commitac0dcd1e07e8f2642c01912d9dfbc457a18fdfae (patch)
treebda2a13a82e8cbf9b7a99824c6e9783339a6f876 /source4
parent113a9c1806863f9794c3a611ed4c4d910c3bf11b (diff)
downloadsamba-ac0dcd1e07e8f2642c01912d9dfbc457a18fdfae.tar.gz
samba-ac0dcd1e07e8f2642c01912d9dfbc457a18fdfae.tar.bz2
samba-ac0dcd1e07e8f2642c01912d9dfbc457a18fdfae.zip
s4:upgradeprovision - why not directly use "provision:0"?
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/scripting/bin/upgradeprovision8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 5d217ab00d..27e142b058 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -490,7 +490,7 @@ def handle_special_add(samdb, dn, names):
if len(res) > 0 and len(res2) == 0:
message(CHANGE, "Existing object %s must be replaced by %s,"
"Renaming old object" % (str(oldDn), str(dn)))
- samdb.rename(oldDn, objDn, ["relax:0", "local_oid:1.3.6.1.4.1.7165.4.3.16:0"])
+ samdb.rename(oldDn, objDn, ["relax:0", "provision:0"])
return 0
@@ -602,7 +602,7 @@ def add_missing_object(ref_samdb, samdb, dn, names, basedn, hash, index):
delta.dn = dn
if not skip:
message(CHANGE,"Object %s will be added" % dn)
- samdb.add(delta, ["relax:0", "local_oid:1.3.6.1.4.1.7165.4.3.16:0"])
+ samdb.add(delta, ["relax:0", "provision:0"])
else:
message(CHANGE,"Object %s was skipped" % dn)
@@ -655,7 +655,7 @@ def add_deletedobj_containers(ref_samdb, samdb, names):
for att in hashAttrNotCopied.keys():
delta.remove(att)
- modcontrols = ["relax:0", "local_oid:1.3.6.1.4.1.7165.4.3.16:0"]
+ modcontrols = ["relax:0", "provision:0"]
samdb.add(delta, modcontrols)
listwko = []
@@ -992,7 +992,7 @@ def update_present(ref_samdb, samdb, basedn, listPresent, usns, invocationid):
#for checkedatt in relaxedatt:
for attr in delta.keys():
if attr.lower() in relaxedatt:
- modcontrols = ["relax:0", "local_oid:1.3.6.1.4.1.7165.4.3.16:0"]
+ modcontrols = ["relax:0", "provision:0"]
message(CHANGE, "%s is different from the reference one, changed"
" attributes: %s\n" % (dn, attributes))
changed += 1