diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-24 14:16:59 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-26 11:57:06 -0600 |
| commit | 3c22677a8ce1635d7e055f954153dec4c1796b17 (patch) | |
| tree | be568cf2aa91f41c6a1c9e2d173f893006cd3ad8 /source4/scripting/python/samba/upgrade.py | |
| parent | 8ada900ee67fc8e1a1ff94c9e5f7a50752d11017 (diff) | |
| download | samba-3c22677a8ce1635d7e055f954153dec4c1796b17.tar.gz samba-3c22677a8ce1635d7e055f954153dec4c1796b17.tar.xz samba-3c22677a8ce1635d7e055f954153dec4c1796b17.zip | |
r26591: Get the first bits of samba3dump to work again.
(This used to be commit 3511027515f8ea860fbe46639d9169999646a297)
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 4f2ab46ef0..375c39eb5a 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -447,7 +447,6 @@ def upgrade_smbconf(oldconf,mark): def upgrade(subobj, samba3, message, paths, session_info, credentials): ret = 0 - lp = loadparm_init() samdb = Ldb(paths.samdb, session_info=session_info, credentials=credentials) message("Writing configuration") @@ -455,8 +454,7 @@ def upgrade(subobj, samba3, message, paths, session_info, credentials): newconf.save(paths.smbconf) message("Importing account policies") - ldif = upgrade_sam_policy(samba3,subobj.BASEDN) - samdb.modify(ldif) + samdb.modify_ldif(upgrade_sam_policy(samba3,subobj.BASEDN)) regdb = Ldb(paths.hklm) regdb.modify(""" |