summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-05 11:09:14 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-09-05 11:25:38 +1000
commit4a9f5d759f0b244fb27ea8a01455b5fd0a43c334 (patch)
tree46d710222e27f40808398944bb537dfb4404ff3d
parentfe754cc7ac9587da8fe6c103052e290361b03eee (diff)
downloadsamba-4a9f5d759f0b244fb27ea8a01455b5fd0a43c334.tar.gz
samba-4a9f5d759f0b244fb27ea8a01455b5fd0a43c334.tar.bz2
samba-4a9f5d759f0b244fb27ea8a01455b5fd0a43c334.zip
s4-provision Fix type error on existing idmap entries in s3 upgrade
This is already a DN object. Andrew Bartlett
-rw-r--r--source4/scripting/python/samba/upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index aaadb6a418..284e8a6ea9 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -89,7 +89,7 @@ def add_idmap_entry(idmapdb, sid, xid, xid_type, logger):
if found:
try:
m = ldb.Message()
- m.dn = ldb.Dn(idmapdb, msg[0]['dn'])
+ m.dn = msg[0]['dn']
m['xidNumber'] = ldb.MessageElement(str(xid), ldb.FLAG_MOD_REPLACE, 'xidNumber')
m['type'] = ldb.MessageElement(xid_type, ldb.FLAG_MOD_REPLACE, 'type')
idmapdb.modify(m)