From: Andrew Bartlett Date: Mon, 14 Sep 2015 01:48:04 +0000 (+1200) Subject: python/kcc: Write correct module list into the file during ldif_to_samdb X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=dadfffb51916ab26de51924733b31969173627a7;p=obnox%2Fsamba%2Fsamba-obnox.git python/kcc: Write correct module list into the file during ldif_to_samdb Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam --- diff --git a/python/samba/kcc/ldif_import_export.py b/python/samba/kcc/ldif_import_export.py index ab7c7a0a1bf..76986f3eed0 100644 --- a/python/samba/kcc/ldif_import_export.py +++ b/python/samba/kcc/ldif_import_export.py @@ -70,9 +70,13 @@ def ldif_to_samdb(dburl, lp, ldif_file, forced_local_dsa=None): changetype: modify replace: dsServiceName dsServiceName: CN=NTDS Settings,%s -- """ % forced_local_dsa) + tmpdb.add_ldif("""dn: @MODULES +@LIST: rootdse,extended_dn_in,extended_dn_out_ldb +- +""") + except Exception, estr: tmpdb.transaction_cancel() raise LdifError("Failed to import %s: %s" % (ldif_file, estr)) @@ -82,9 +86,7 @@ dsServiceName: CN=NTDS Settings,%s # We have an abbreviated list of options here because we have built # an abbreviated database. We use the rootdse and extended-dn # modules only during this re-open - samdb = SamDB(url=dburl, session_info=system_session(), lp=lp, - options=["modules:rootdse,extended_dn_in," - "extended_dn_out_ldb"]) + samdb = SamDB(url=dburl, session_info=system_session(), lp=lp) return samdb