diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-09-26 10:19:18 -0700 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-10-11 08:32:10 +0200 |
| commit | 48b979c4fec39c8d3b9684b4a759715c0f93e9cc (patch) | |
| tree | 07d9c8f6bc9e0e3c338b4918a9a3e1f9545f3477 /source4 | |
| parent | a2d45cf49e4976d55261d01df955e412ac7fa73f (diff) | |
| download | samba-48b979c4fec39c8d3b9684b4a759715c0f93e9cc.tar.gz samba-48b979c4fec39c8d3b9684b4a759715c0f93e9cc.tar.bz2 samba-48b979c4fec39c8d3b9684b4a759715c0f93e9cc.zip | |
provision: Remove --username and --password options from samba-tool domain provision
This avoids confusion, because the LDAP backend does not use these,
and they do not set the password for the administrator account either!
This may break support for the 'existing' backend LDAP backend, but
that is nothing more than a stub for future development anyway, and
new work in this area should use EXTERNAL in any case.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/scripting/bin/samba_upgradeprovision | 2 | ||||
| -rwxr-xr-x | source4/setup/tests/blackbox_provision-backend.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision index 88e0206e59..c4a0f79329 100755 --- a/source4/scripting/bin/samba_upgradeprovision +++ b/source4/scripting/bin/samba_upgradeprovision @@ -1632,7 +1632,7 @@ if __name__ == '__main__': message(SIMPLE, "Creating a reference provision") provisiondir = tempfile.mkdtemp(dir=paths.private_dir, prefix="referenceprovision") - result = newprovision(names, creds, session, smbconf, provisiondir, + result = newprovision(names, session, smbconf, provisiondir, provision_logger) result.report_logger(provision_logger) diff --git a/source4/setup/tests/blackbox_provision-backend.sh b/source4/setup/tests/blackbox_provision-backend.sh index 5dec621e59..fc455d5e12 100755 --- a/source4/setup/tests/blackbox_provision-backend.sh +++ b/source4/setup/tests/blackbox_provision-backend.sh @@ -13,7 +13,7 @@ shift 1 . `dirname $0`/../../../testprogs/blackbox/subunit.sh testit "openldap-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode -testit "openldap-mmr-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-mmr-backend --ol-mmr-urls="ldap://s4dc1.test:9000,ldap://s4dc2.test:9000" --username=samba-admin --password=linux --adminpass=linux --ldapadminpass=linux --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode +testit "openldap-mmr-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-mmr-backend --ol-mmr-urls="ldap://s4dc1.test:9000,ldap://s4dc2.test:9000" --adminpass=linux --ldapadminpass=linux --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode testit "fedora-ds-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode reprovision() { |