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 /python/samba/netcmd/domain.py | |
| 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 'python/samba/netcmd/domain.py')
| -rw-r--r-- | python/samba/netcmd/domain.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 0698928de0..217b5369b7 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -144,7 +144,6 @@ class cmd_domain_provision(Command): takes_optiongroups = { "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, - "credopts": options.CredentialsOptions, } takes_options = [ @@ -231,7 +230,7 @@ class cmd_domain_provision(Command): takes_args = [] - def run(self, sambaopts=None, credopts=None, versionopts=None, + def run(self, sambaopts=None, versionopts=None, interactive=None, domain=None, domain_guid=None, @@ -278,10 +277,6 @@ class cmd_domain_provision(Command): lp = sambaopts.get_loadparm() smbconf = lp.configfile - creds = credopts.get_credentials(lp) - - creds.set_kerberos_state(DONT_USE_KERBEROS) - if dns_forwarder is not None: suggested_forwarder = dns_forwarder else: @@ -408,7 +403,7 @@ class cmd_domain_provision(Command): session = system_session() try: result = provision(self.logger, - session, creds, smbconf=smbconf, targetdir=targetdir, + session, smbconf=smbconf, targetdir=targetdir, samdb_fill=samdb_fill, realm=realm, domain=domain, domainguid=domain_guid, domainsid=domain_sid, hostname=host_name, |