diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 13:26:59 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 13:26:59 +0100 |
| commit | a19534d2072ca7dc4c70767d02db58503678cfaa (patch) | |
| tree | 03541a126783dbdbabfdabebe7ae78c48bfe5075 /source4/scripting/python/samba/upgrade.py | |
| parent | e0a5fb8a9be9f3002d6f73c272793a75fa71d313 (diff) | |
| parent | af007e5837ac472f0527505c8013b837932136bc (diff) | |
| download | samba-a19534d2072ca7dc4c70767d02db58503678cfaa.tar.gz samba-a19534d2072ca7dc4c70767d02db58503678cfaa.tar.xz samba-a19534d2072ca7dc4c70767d02db58503678cfaa.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit eff9c9cedd7410c3c089d090e3f83f8cc10f1831)
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 8bf75d776e0..01b62ff9840 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -18,6 +18,7 @@ from samba import Ldb from samba.samdb import SamDB def import_sam_policy(samldb, samba3_policy, domaindn): + """Import a Samba 3 policy database.""" samldb.modify_ldif(""" dn: %s changetype: modify @@ -201,7 +202,8 @@ def import_wins(samba4_winsdb, samba3_winsdb): "versionID": str(version_id), "address": ips}) - samba4_winsdb.add({"dn": "CN=VERSION", + samba4_winsdb.add({"dn": "cn=VERSION", + "cn": "VERSION", "objectClass": "winsMaxVersion", "maxVersion": str(version_id)}) |