summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2016-11-23 17:40:47 +0100
committerMartin Basti <mbasti@redhat.com>2016-11-29 14:50:51 +0100
commit7d5c680ace7ccea3b0f7f1471cf8dbc07b3da5a1 (patch)
tree9dbbb1c9cf63a236947ecee6d82ea16d4c256a3e /client
parent75b70e3f0d52a9c98f443d3fc2f7cef92bdc7b1a (diff)
downloadfreeipa-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 'client')
-rwxr-xr-xclient/ipa-client-automount3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/ipa-client-automount b/client/ipa-client-automount
index c1790194e..e7fddaf03 100755
--- a/client/ipa-client-automount
+++ b/client/ipa-client-automount
@@ -42,6 +42,7 @@ from six.moves.urllib.parse import urlsplit
from optparse import OptionParser # pylint: disable=deprecated-module
from ipalib import api, errors
from ipalib.install import sysrestore
+from ipalib.install.kinit import kinit_keytab
from ipapython import ipautil
from ipaclient import ipadiscovery
from ipaclient import ipachangeconf
@@ -443,7 +444,7 @@ def main():
try:
try:
host_princ = str('host/%s@%s' % (api.env.host, api.env.realm))
- ipautil.kinit_keytab(host_princ, paths.KRB5_KEYTAB, ccache_name)
+ kinit_keytab(host_princ, paths.KRB5_KEYTAB, ccache_name)
os.environ['KRB5CCNAME'] = ccache_name
except gssapi.exceptions.GSSError as e:
sys.exit("Failed to obtain host TGT: %s" % e)