diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-07-15 15:46:32 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-07-15 15:46:32 +1000 |
| commit | 0f1eea267257eff0d75a702ee0793a86834fb76a (patch) | |
| tree | c0c90a90d4718c32676671adabf76648fefbf229 /source4/setup | |
| parent | a6b842f9634cbeb4075c2bbaf7e49c19104602be (diff) | |
| download | samba-0f1eea267257eff0d75a702ee0793a86834fb76a.tar.gz samba-0f1eea267257eff0d75a702ee0793a86834fb76a.tar.bz2 samba-0f1eea267257eff0d75a702ee0793a86834fb76a.zip | |
Rework provision to handle both simple and SASL binds.
Fedora DS is still setup for simple binds only, at this point.
(it also fails on other issues).
Andrew Bartlett
(This used to be commit b24c572d5a38c1f6906751c2ad2f809e1995b510)
Diffstat (limited to 'source4/setup')
| -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) |