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 | |
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')
-rwxr-xr-x | install/oddjob/com.redhat.idm.trust-fetch-domains | 3 | ||||
-rw-r--r-- | install/restart_scripts/renew_ca_cert | 3 | ||||
-rw-r--r-- | install/restart_scripts/renew_ra_cert | 5 | ||||
-rwxr-xr-x | install/tools/ipa-ca-install | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/install/oddjob/com.redhat.idm.trust-fetch-domains b/install/oddjob/com.redhat.idm.trust-fetch-domains index b663daab5..a0d8a3165 100755 --- a/install/oddjob/com.redhat.idm.trust-fetch-domains +++ b/install/oddjob/com.redhat.idm.trust-fetch-domains @@ -7,7 +7,6 @@ from ipalib import api from ipapython.dn import DN from ipalib.config import Env from ipalib.constants import DEFAULT_CONFIG -from ipapython.ipautil import kinit_keytab from ipaplatform.constants import constants import sys import os @@ -16,6 +15,8 @@ import pwd import six import gssapi +from ipalib.install.kinit import kinit_keytab + if six.PY3: unicode = str diff --git a/install/restart_scripts/renew_ca_cert b/install/restart_scripts/renew_ca_cert index 0f0a69031..31412f7ad 100644 --- a/install/restart_scripts/renew_ca_cert +++ b/install/restart_scripts/renew_ca_cert @@ -29,6 +29,7 @@ import traceback from ipapython import ipautil from ipalib import api, errors, x509, certstore +from ipalib.install.kinit import kinit_keytab from ipaserver.install import certs, cainstance, installutils from ipaserver.plugins.ldap2 import ldap2 from ipaplatform import services @@ -72,7 +73,7 @@ def _main(): try: principal = str('host/%s@%s' % (api.env.host, api.env.realm)) ccache_filename = os.path.join(tmpdir, 'ccache') - ipautil.kinit_keytab(principal, paths.KRB5_KEYTAB, ccache_filename) + kinit_keytab(principal, paths.KRB5_KEYTAB, ccache_filename) os.environ['KRB5CCNAME'] = ccache_filename ca = cainstance.CAInstance(host_name=api.env.host) diff --git a/install/restart_scripts/renew_ra_cert b/install/restart_scripts/renew_ra_cert index 40ef7289b..eb11c81a8 100644 --- a/install/restart_scripts/renew_ra_cert +++ b/install/restart_scripts/renew_ra_cert @@ -27,7 +27,7 @@ import tempfile import shutil import traceback -from ipapython import ipautil +from ipalib.install.kinit import kinit_keytab from ipalib import api from ipaserver.install import certs, cainstance, krainstance from ipaplatform.paths import paths @@ -44,8 +44,7 @@ def _main(): try: principal = str('host/%s@%s' % (api.env.host, api.env.realm)) ccache_filename = os.path.join(tmpdir, 'ccache') - ipautil.kinit_keytab(principal, paths.KRB5_KEYTAB, - ccache_filename) + kinit_keytab(principal, paths.KRB5_KEYTAB, ccache_filename) os.environ['KRB5CCNAME'] = ccache_filename ca = cainstance.CAInstance(host_name=api.env.host) 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) |