Rework provision to handle both simple and SASL binds.

[samba.git] / source4 / setup / provision-backend

diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend
index 54dc5839bfaf27d0f79078cce06e7df7102f2a08..845dc8679a2ad4a3e8ff8aad9725f2a2f52b5329 100755 (executable)
--- 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)