diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-11-23 17:40:47 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 14:50:51 +0100 |
| commit | 7d5c680ace7ccea3b0f7f1471cf8dbc07b3da5a1 (patch) | |
| tree | 9dbbb1c9cf63a236947ecee6d82ea16d4c256a3e /ipaserver/install/installutils.py | |
| parent | 75b70e3f0d52a9c98f443d3fc2f7cef92bdc7b1a (diff) | |
| download | freeipa-7d5c680ace7ccea3b0f7f1471cf8dbc07b3da5a1.tar.gz freeipa-7d5c680ace7ccea3b0f7f1471cf8dbc07b3da5a1.tar.xz freeipa-7d5c680ace7ccea3b0f7f1471cf8dbc07b3da5a1.zip | |
ipautil: move kinit functions to ipalib.install
kinit_password() depends on ipaplatform.
Move kinit_password() as well as kinit_keytab() to a new
ipalib.install.kinit module, as they are used only from installers.
https://fedorahosted.org/freeipa/ticket/6474
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaserver/install/installutils.py')
| -rw-r--r-- | ipaserver/install/installutils.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 3968b5a51..a3e7aedea 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -45,6 +45,7 @@ from six.moves.configparser import SafeConfigParser, NoOptionError # pylint: enable=import-error from ipalib.install import sysrestore +from ipalib.install.kinit import kinit_password import ipaplatform from ipapython import ipautil, admintool, version from ipapython.admintool import ScriptError @@ -1204,7 +1205,7 @@ def check_creds(options, realm_name): options.admin_password = stdin try: - ipautil.kinit_password(principal, stdin, ccache_name) + kinit_password(principal, stdin, ccache_name) except RuntimeError as e: root_logger.error("Kerberos authentication failed: %s" % e) raise ScriptError("Invalid credentials: %s" % e) |