summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2012-09-12 07:31:15 -0400
committerRob Crittenden <rcritten@redhat.com>2012-09-11 15:41:45 -0400
commitc87ac6bc67293ab012515937a53b4ed15ea6139e (patch)
tree3189081cca9ece349bc21e7c3266f36fa9c1a40f /ipa-client
parentb4d35718a52e2649a407b95b85193f20401c346d (diff)
downloadfreeipa-c87ac6bc67293ab012515937a53b4ed15ea6139e.tar.gz
freeipa-c87ac6bc67293ab012515937a53b4ed15ea6139e.tar.xz
freeipa-c87ac6bc67293ab012515937a53b4ed15ea6139e.zip
Fix server installation
The fix to ticket #2982 removed a kinit call when the client was installed as part of a master. Re-add the kinit call in this case.
Diffstat (limited to 'ipa-client')
-rwxr-xr-xipa-client/ipa-install/ipa-client-install12
1 files changed, 10 insertions, 2 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 06e079839..392aa65a0 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -1569,8 +1569,16 @@ def install(options, env, fstore, statestore):
root_logger.info("Failed to add CA to the default NSS database.")
return CLIENT_INSTALL_ERROR
- # If on master assume kerberos is already configured properly.
- if not options.on_master:
+ if options.on_master:
+ # If on master assume kerberos is already configured properly.
+ # Get the host TGT.
+ try:
+ run(['/usr/bin/kinit', '-k', '-t', '/etc/krb5.keytab',
+ 'host/%s@%s' % (hostname, cli_realm)], env=env)
+ except CalledProcessError, e:
+ root_logger.error("Failed to obtain host TGT.")
+ return CLIENT_INSTALL_ERROR
+ else:
# Configure krb5.conf
fstore.backup_file("/etc/krb5.conf")
if configure_krb5_conf(