diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-02 15:49:36 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 15:02:39 +1000 |
| commit | 834d590bcff79e2d458b9e193be0c64e849a6362 (patch) | |
| tree | c0bb30dcbdd4f49be651e08e78c1e0b9e1a4b147 /source4/scripting/python/samba | |
| parent | 1565da76947f91add10a54096cdfe2ab67917b32 (diff) | |
| download | samba-834d590bcff79e2d458b9e193be0c64e849a6362.tar.gz samba-834d590bcff79e2d458b9e193be0c64e849a6362.tar.bz2 samba-834d590bcff79e2d458b9e193be0c64e849a6362.zip | |
s4-param Remove 'idmap database'
This is now just idmap.ldb in the private dir, which remains.
Diffstat (limited to 'source4/scripting/python/samba')
| -rw-r--r-- | source4/scripting/python/samba/idmap.py | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/idmap.py b/source4/scripting/python/samba/idmap.py index 93fca46edd..9d957341de 100644 --- a/source4/scripting/python/samba/idmap.py +++ b/source4/scripting/python/samba/idmap.py @@ -41,7 +41,7 @@ class IDmapDB(samba.Ldb): self.lp = lp if url is None: - url = lp.get("idmap database") + url = lp.private_path("idmap.ldb") super(IDmapDB, self).__init__(url=url, lp=lp, modules_dir=modules_dir, session_info=session_info, credentials=credentials, flags=flags, diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index b99eec9ab8..bd3ab8a4f4 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -518,8 +518,7 @@ def provision_paths_from_lp(lp, dnsdomain): paths.shareconf = os.path.join(paths.private_dir, "share.ldb") paths.samdb = os.path.join(paths.private_dir, "sam.ldb") - paths.idmapdb = os.path.join(paths.private_dir, - lp.get("idmap database") or "idmap.ldb") + paths.idmapdb = os.path.join(paths.private_dir, "idmap.ldb") paths.secrets = os.path.join(paths.private_dir, "secrets.ldb") paths.privilege = os.path.join(paths.private_dir, "privilege.ldb") paths.dns = os.path.join(paths.private_dir, "dns", dnsdomain + ".zone") |