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 /install/tools | |
| 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 'install/tools')
| -rwxr-xr-x | install/tools/ipa-ca-install | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index 043ab322b..bf817c7f1 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -22,6 +22,8 @@ import sys import os import shutil import tempfile + +from ipalib.install.kinit import kinit_keytab from ipapython import ipautil from ipaserver.install import installutils @@ -227,7 +229,7 @@ def promote(safe_options, options, filename): with ipautil.private_ccache(): ccache = os.environ['KRB5CCNAME'] - ipautil.kinit_keytab( + kinit_keytab( 'host/{env.host}@{env.realm}'.format(env=api.env), paths.KRB5_KEYTAB, ccache) |