s4-provision Fix type error on existing idmap entries in s3 upgrade
authorAndrew Bartlett <abartlet@samba.org>
Mon, 5 Sep 2011 01:09:14 +0000 (11:09 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 5 Sep 2011 01:25:38 +0000 (11:25 +1000)
This is already a DN object.

Andrew Bartlett

source4/scripting/python/samba/upgrade.py

index aaadb6a418f9b719e39105ba7cd7d5e22bf35db0..284e8a6ea9299ef7de5764684581beeacf2f0a77 100644 (file)
@@ -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)