summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-05-29 15:32:42 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-05-29 15:32:42 +1000
commitea039105b2b728c2a5713800c4c3165fc5f3e575 (patch)
treef579b34c85a539c4622614df2c9eb13fa4df1ee9
parent844a7ad15a8c91cbdfae3ead747c16eeae1e2f96 (diff)
parent8bd5095aa3bcd79d4063067180b1c1f60f351982 (diff)
downloadsamba-ea039105b2b728c2a5713800c4c3165fc5f3e575.tar.gz
samba-ea039105b2b728c2a5713800c4c3165fc5f3e575.tar.bz2
samba-ea039105b2b728c2a5713800c4c3165fc5f3e575.zip
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
(This used to be commit 88c9200b7802954ce8aac82901ab7aec1fa8330a)
-rw-r--r--howto.txt5
-rw-r--r--source4/scripting/python/samba/provision.py2
2 files changed, 2 insertions, 5 deletions
diff --git a/howto.txt b/howto.txt
index ae9b0e2848..3ae225ddb8 100644
--- a/howto.txt
+++ b/howto.txt
@@ -80,12 +80,9 @@ Must be run as a user with permission to write to the install directory.
::
# cd source
- # bin/smbpython ./setup/provision --realm=YOUR.REALM --domain=YOURDOM \
+ # ./setup/provision --realm=YOUR.REALM --domain=YOURDOM \
# --adminpass=SOMEPASSWORD --server-role='domain controller'
-REMINDER: Use the path to smbpython, as the provision command
- will not work with the system python.
-
'YOURDOM' is the NT4 style domain name. 'YOUR.REALM' is your kerberos
realm, which is typically your DNS domain name.
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 3914fa8376..4a9def8aa9 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -969,7 +969,7 @@ def provision(setup_dir, message, session_info,
if ldap_backend is not None:
if ldap_backend == "ldapi":
# provision-backend will set this path suggested slapd command line / fedorads.inf
- ldap_backend = "ldapi://" % urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
+ ldap_backend = "ldapi://%s" % urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
# only install a new shares config db if there is none
if not os.path.exists(paths.shareconf):