summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-08-14 09:37:50 +1000
committerAndrew Bartlett <abartlet@samba.org>2009-08-17 09:51:00 +1000
commite7bae2eb0a103f9b8a26013017f510b7c6f8e4fc (patch)
tree368c4a1480af4610620ea6318da2aa94aa69f455 /source4/setup
parent052da4e4d77ceb0307ad2477f2bc4a17334d6565 (diff)
downloadsamba-e7bae2eb0a103f9b8a26013017f510b7c6f8e4fc.tar.gz
samba-e7bae2eb0a103f9b8a26013017f510b7c6f8e4fc.tar.bz2
samba-e7bae2eb0a103f9b8a26013017f510b7c6f8e4fc.zip
s4: Re-add --ldapadminpass as an option to provision
This should make setting up LDAP servers more predictable. When not specified, it is random Andrew Bartlett
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/provision3
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/setup/provision b/source4/setup/provision
index 5686ee0e26..27a33122be 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -70,6 +70,8 @@ parser.add_option("--machinepass", type="string", metavar="PASSWORD",
help="choose machine password (otherwise random)")
parser.add_option("--dnspass", type="string", metavar="PASSWORD",
help="choose dns password (otherwise random)")
+parser.add_option("--ldapadminpass", type="string", metavar="PASSWORD",
+ help="choose password to set between Samba and it's LDAP backend (otherwise random)")
parser.add_option("--root", type="string", metavar="USERNAME",
help="choose 'root' unix username")
parser.add_option("--nobody", type="string", metavar="USERNAME",
@@ -188,6 +190,7 @@ provision(setup_dir, message,
serverrole=server_role,
ldap_backend_extra_port=opts.ldap_backend_extra_port,
ldap_backend_type=opts.ldap_backend_type,
+ ldapadminpass=opts.ldapadminpass,
ol_mmr_urls=opts.ol_mmr_urls,
slapd_path=opts.slapd_path,
setup_ds_path=opts.setup_ds_path,