From f0160a2ed28325e46be2921ac44d71ee88d1b3b1 Mon Sep 17 00:00:00 2001
From: Stanislav Laznicka <slaznick@redhat.com>
Date: Jun 02 2016 18:09:36 +0000
Subject: Added <my_hostname>=<IPA REALM> mapping to krb5.conf


https://fedorahosted.org/freeipa/ticket/5903

Reviewed-By: Martin Basti <mbasti@redhat.com>

---

diff --git a/client/ipa-client-install b/client/ipa-client-install
index 538b6ad..1606d1d 100755
--- a/client/ipa-client-install
+++ b/client/ipa-client-install
@@ -1049,7 +1049,7 @@ def hardcode_ldap_server(cli_server):
     return
 
 def configure_krb5_conf(cli_realm, cli_domain, cli_server, cli_kdc, dnsok,
-        options, filename, client_domain):
+        options, filename, client_domain, client_hostname):
 
     krbconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer")
     krbconf.setOptionAssignment((" = ", " "))
@@ -1108,7 +1108,8 @@ def configure_krb5_conf(cli_realm, cli_domain, cli_server, cli_kdc, dnsok,
 
     #[domain_realm]
     dropts = [{'name':'.'+cli_domain, 'type':'option', 'value':cli_realm},
-              {'name':cli_domain, 'type':'option', 'value':cli_realm}]
+              {'name':cli_domain, 'type':'option', 'value':cli_realm},
+              {'name':client_hostname, 'type':'option', 'value':cli_realm}]
 
     #add client domain mapping if different from server domain
     if cli_domain != client_domain:
@@ -2560,7 +2561,8 @@ def install(options, env, fstore, statestore):
                     dnsok=False,
                     options=options,
                     filename=krb_name,
-                    client_domain=client_domain):
+                    client_domain=client_domain,
+                    client_hostname=hostname):
                 root_logger.error("Test kerberos configuration failed")
                 return CLIENT_INSTALL_ERROR
             env['KRB5_CONFIG'] = krb_name
@@ -2761,7 +2763,8 @@ def install(options, env, fstore, statestore):
                 dnsok=dnsok,
                 options=options,
                 filename=paths.KRB5_CONF,
-                client_domain=client_domain):
+                client_domain=client_domain,
+                client_hostname=hostname):
             return CLIENT_INSTALL_ERROR
 
         root_logger.info(
diff --git a/install/share/krb5.conf.template b/install/share/krb5.conf.template
index 92431d3..6313677 100644
--- a/install/share/krb5.conf.template
+++ b/install/share/krb5.conf.template
@@ -26,6 +26,7 @@ $OTHER_LIBDEFAULTS
 [domain_realm]
  .$DOMAIN = $REALM
  $DOMAIN = $REALM
+ $FQDN = $REALM
 $OTHER_DOMAIN_REALM_MAPS
 [dbmodules]
   $REALM = {