summaryrefslogtreecommitdiffstats
path: root/source4/scripting/python/samba/upgrade.py
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-24 13:04:33 -0600
committerStefan Metzmacher <metze@samba.org>2007-12-26 11:57:04 -0600
commit95b1f554b2c57a9f975a0cc27ca51bec6c7594d6 (patch)
treed7ad7acc55c859e5a018666d0deed19f9e5efcd9 /source4/scripting/python/samba/upgrade.py
parent6c9a2a3c52592e12d9cb0b312dbeee4311aa0c24 (diff)
downloadsamba-95b1f554b2c57a9f975a0cc27ca51bec6c7594d6.tar.gz
samba-95b1f554b2c57a9f975a0cc27ca51bec6c7594d6.tar.xz
samba-95b1f554b2c57a9f975a0cc27ca51bec6c7594d6.zip
r26587: Fix reading Samba 3 WINS database and initial work on group db, aliases and secrets.
(This used to be commit c7c4cf258ac7975b409d26c9386838d4780c756f)
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
-rw-r--r--source4/scripting/python/samba/upgrade.py21
1 files changed, 13 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 3168fedf2d..4f2ab46ef0 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -530,14 +530,7 @@ data: %d
if ldapurl is not None:
message("Enabling Samba3 LDAP mappings for SAM database")
- samdb.modify("""
-dn: @MODULES
-changetype: modify
-replace: @LIST
-@LIST: samldb,operational,objectguid,rdn_name,samba3sam
-""")
-
- samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})
+ enable_samba3sam(samdb)
return ret
@@ -551,3 +544,15 @@ def upgrade_verify(subobj, samba3, paths, message):
assert(len(msg) >= 1)
# FIXME
+
+
+
+def enable_samba3sam(samdb):
+ samdb.modify("""
+dn: @MODULES
+changetype: modify
+replace: @LIST
+@LIST: samldb,operational,objectguid,rdn_name,samba3sam
+""")
+
+ samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})