summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-03-13 09:55:06 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-13 09:55:06 +1100
commit07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01 (patch)
tree473ca1a63f7f9c777b6e600423e3d3b1daa9e124 /source4/setup
parent6f2935d082687eee23dbc9f1108162cf1670831a (diff)
downloadsamba-07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01.tar.gz
samba-07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01.tar.bz2
samba-07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01.zip
Update the provision scripts and selftest for LDAP
This should allow us to provision onto an OpenLDAP backend again. Also ensure we always have a sysvol and netlogon share in the selftest environment. Andrew Bartlett (This used to be commit b2d9b03ba3434e76d4d476233a198728523d17f9)
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/provision-backend6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend
index 91d7bdcb0a..ada6dcef8d 100755
--- a/source4/setup/provision-backend
+++ b/source4/setup/provision-backend
@@ -46,8 +46,8 @@ parser.add_option("--domain", type="string", metavar="DOMAIN",
help="set domain")
parser.add_option("--host-name", type="string", metavar="HOSTNAME",
help="set hostname")
-parser.add_option("--adminpass", type="string", metavar="PASSWORD",
- help="choose admin password (otherwise random)")
+parser.add_option("--ldap-manager-pass", type="string", metavar="PASSWORD",
+ help="choose LDAP manager password (otherwise random)")
parser.add_option("--root", type="string", metavar="USERNAME",
help="choose 'root' unix username")
parser.add_option("--quiet", help="Be quiet", action="store_true")
@@ -91,7 +91,7 @@ if setup_dir is None:
provision_backend(setup_dir=setup_dir, message=message, smbconf=smbconf, targetdir=opts.targetdir,
realm=opts.realm, domain=opts.domain,
hostname=opts.host_name,
- adminpass=opts.adminpass,
+ adminpass=opts.ldap_manager_pass,
root=opts.root, serverrole=server_role,
ldap_backend_type=opts.ldap_backend_type)