summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-08 03:03:44 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-08 03:03:44 +0100
commitfffe4f3bdd27b11dce75c9b2c931f5291f04ab6b (patch)
tree110c55b503a1df8fa1202329c1075d8b89c16477
parentb4f7a80c2d2bd6bd721bf94c8ea4ff8dc56eb8d7 (diff)
downloadsamba-fffe4f3bdd27b11dce75c9b2c931f5291f04ab6b.tar.gz
samba-fffe4f3bdd27b11dce75c9b2c931f5291f04ab6b.tar.bz2
samba-fffe4f3bdd27b11dce75c9b2c931f5291f04ab6b.zip
Fix formatting.
(This used to be commit 73d1b0fcb64fdc7be1e1e1002f3f182fcbe476ae)
-rw-r--r--source4/scripting/python/samba/provision.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d2a4f28b64..bcadcca583 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -319,14 +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
schema_ldb = "schema.ldb"
if ldap_backend is not None:
- schema_ldb = ldap_backend
-
+ schema_ldb = ldap_backend
+
if ldap_backend_type == "fedora-ds":
backend_modules = ["nsuniqueid","paged_searches"]
elif ldap_backend_type == "openldap":
@@ -737,8 +737,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()
@@ -755,7 +755,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")
@@ -769,9 +769,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