diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-07-15 20:27:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-07-15 20:27:43 +1000 |
| commit | d904b71879cf980f602bfd400cf98396616c13e1 (patch) | |
| tree | faffbb30f594b04903813f5267bd0c7d01c5d575 /source4/setup/provision-backend | |
| parent | cc44b10c240e22a7db83c641a9015dad3ec2e0de (diff) | |
| parent | 63d91e9ab0ecc1e80edff27ae09b249c68453106 (diff) | |
| download | samba-d904b71879cf980f602bfd400cf98396616c13e1.tar.gz samba-d904b71879cf980f602bfd400cf98396616c13e1.tar.bz2 samba-d904b71879cf980f602bfd400cf98396616c13e1.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 7fb8179f214bbba95eb35d221cb9892b55afe121)
Diffstat (limited to 'source4/setup/provision-backend')
| -rwxr-xr-x | source4/setup/provision-backend | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend index 54dc5839bf..845dc8679a 100755 --- a/source4/setup/provision-backend +++ b/source4/setup/provision-backend @@ -49,8 +49,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("--ldap-manager-pass", type="string", metavar="PASSWORD", - help="choose LDAP manager password (otherwise random)") +parser.add_option("--ldap-admin-pass", type="string", metavar="PASSWORD", + help="choose LDAP admin 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") @@ -96,7 +96,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.ldap_manager_pass, + adminpass=opts.ldap_admin_pass, root=opts.root, serverrole=server_role, ldap_backend_type=opts.ldap_backend_type, ldap_backend_port=opts.ldap_backend_port) |