diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-09 10:00:14 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-09 10:00:14 +1100 |
| commit | 0ca20977ef5a228bc0240fb516af6af68ae3b2de (patch) | |
| tree | e8447e8acf1dafb9e38be3ea82bb37228ebe1061 /source4/scripting/python | |
| parent | b2d47f9794bc805051fde55f1f94d29db96c6a62 (diff) | |
| parent | 1f974c8aa7e21bd663bc4fd639d845f63e68e241 (diff) | |
| download | samba-0ca20977ef5a228bc0240fb516af6af68ae3b2de.tar.gz samba-0ca20977ef5a228bc0240fb516af6af68ae3b2de.tar.bz2 samba-0ca20977ef5a228bc0240fb516af6af68ae3b2de.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 1bf9d0401012cd3c830d50844f5be35e53835322)
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 9a44983d8e..0c16ab3bfe 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -319,12 +319,14 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, domaindn_ldb = "users.ldb" if ldap_backend is not None: - domaindn_ldb = ldap_backend + domaindn_ldb = ldap_backend configdn_ldb = "configuration.ldb" if ldap_backend is not None: - configdn_ldb = ldap_backend + configdn_ldb = ldap_backend schemadn_ldb = "schema.ldb" if ldap_backend is not None: + schema_ldb = ldap_backend + schemadn_ldb = ldap_backend if ldap_backend_type == "fedora-ds": @@ -745,8 +747,8 @@ def provision(lp, setup_dir, message, paths, session_info, ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="") if ldap_backend == "ldapi": - # provision-backend will set this path suggested slapd command line / fedorads.inf - ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"), safe="") + # provision-backend will set this path suggested slapd command line / fedorads.inf + ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"), safe="") assert realm is not None realm = realm.upper() @@ -763,7 +765,7 @@ def provision(lp, setup_dir, message, paths, session_info, dnsdomain = realm.lower() if serverrole == "domain controller": - domaindn = "DC=" + dnsdomain.replace(".", ",DC=") + domaindn = "DC=" + dnsdomain.replace(".", ",DC=") if domain is None: domain = lp.get("workgroup") @@ -777,9 +779,9 @@ def provision(lp, setup_dir, message, paths, session_info, raise InvalidNetbiosName(domain) else: - domaindn = "CN=" + netbiosname - domain = netbiosname - + domaindn = "CN=" + netbiosname + domain = netbiosname + if rootdn is None: rootdn = domaindn |