[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1929-g88c9200

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  88c9200b7802954ce8aac82901ab7aec1fa8330a (commit)
       via  b4aa957ae1b87677fbe1583eeab16936f6cd1124 (commit)
       via  7d26145a7fba22b2e1c7c57053aab3180a22089d (commit)
      from  1854ab058b42ce4530324cb8f40eb64e6e32267b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 88c9200b7802954ce8aac82901ab7aec1fa8330a
Merge: 1854ab058b42ce4530324cb8f40eb64e6e32267b b4aa957ae1b87677fbe1583eeab16936f6cd1124
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu May 29 15:32:42 2008 +1000

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

commit b4aa957ae1b87677fbe1583eeab16936f6cd1124
Author: Andrew Kroeger <andrew at sprocks.gotdns.com>
Date:   Sat May 24 08:48:05 2008 -0500

    howto: Remove smbpython.

commit 7d26145a7fba22b2e1c7c57053aab3180a22089d
Author: Andrew Kroeger <andrew at sprocks.gotdns.com>
Date:   Fri May 23 02:20:35 2008 -0500

    provision: Add missing string parameter token when assigning ldap_backend.

-----------------------------------------------------------------------

Summary of changes:
 howto.txt                                  |    5 +----
 source/scripting/python/samba/provision.py |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/howto.txt b/howto.txt
index ae9b0e2..3ae225d 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/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index 3914fa8..4a9def8 100644
--- a/source/scripting/python/samba/provision.py
+++ b/source/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):


-- 
Samba Shared Repository