Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local

(This used to be commit 88c9200b7802954ce8aac82901ab7aec1fa8330a)

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):