diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-02 15:43:40 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 15:02:38 +1000 |
| commit | c091a92be51e8c14bf0b51ab83319fbcb704c91f (patch) | |
| tree | 24e7f44491a9cf328e1622f46c2558d6476dedeb /source4/scripting/python/samba/provision | |
| parent | 6bf88222cc00ac765929ed6e844552a9a776109a (diff) | |
| download | samba-c091a92be51e8c14bf0b51ab83319fbcb704c91f.tar.gz samba-c091a92be51e8c14bf0b51ab83319fbcb704c91f.tar.xz samba-c091a92be51e8c14bf0b51ab83319fbcb704c91f.zip | |
s4-param Remove 'sam database' parameter
This now just relies on the private dir parameter, which remains.
Andrew Bartlett
Diffstat (limited to 'source4/scripting/python/samba/provision')
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index f987fb8ef3..fffd352071 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -432,7 +432,7 @@ def check_install(lp, session_info, credentials): """ if lp.get("realm") == "": raise Exception("Realm empty") - samdb = Ldb(lp.get("sam database"), session_info=session_info, + samdb = Ldb(lp.samdb_url(), session_info=session_info, credentials=credentials, lp=lp) if len(samdb.search("(cn=Administrator)")) != 1: raise ProvisioningError("No administrator account found") @@ -517,8 +517,7 @@ def provision_paths_from_lp(lp, dnsdomain): paths.keytab = "secrets.keytab" paths.shareconf = os.path.join(paths.private_dir, "share.ldb") - paths.samdb = os.path.join(paths.private_dir, - lp.get("sam database") or "samdb.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.secrets = os.path.join(paths.private_dir, |