1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00

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

(This used to be commit 88c9200b7802954ce8aac82901ab7aec1fa8330a)
This commit is contained in:
Andrew Bartlett 2008-05-29 15:32:42 +10:00
commit ea039105b2
2 changed files with 2 additions and 5 deletions

View File

@ -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.

View File

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