IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added <my_hostname>=<IPA REALM> mapping to krb5.conf

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

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Stanislav Laznicka 2016-06-02 15:40:03 +02:00 committed by Martin Basti
parent 12d8a0cf22
commit f0160a2ed2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/ipa-client-install
View File

@ -1049,7 +1049,7 @@ def hardcode_ldap_server(cli_server):
return return
def configure_krb5_conf(cli_realm, cli_domain, cli_server, cli_kdc, dnsok, 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 = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer")
krbconf.setOptionAssignment((" = ", " ")) krbconf.setOptionAssignment((" = ", " "))
@ -1108,7 +1108,8 @@ def configure_krb5_conf(cli_realm, cli_domain, cli_server, cli_kdc, dnsok,
#[domain_realm] #[domain_realm]
dropts = [{'name':'.'+cli_domain, 'type':'option', 'value':cli_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 #add client domain mapping if different from server domain
if cli_domain != client_domain: if cli_domain != client_domain:
@ -2560,7 +2561,8 @@ def install(options, env, fstore, statestore):
dnsok=False, dnsok=False,
options=options, options=options,
filename=krb_name, filename=krb_name,
client_domain=client_domain): client_domain=client_domain,
client_hostname=hostname):
root_logger.error("Test kerberos configuration failed") root_logger.error("Test kerberos configuration failed")
return CLIENT_INSTALL_ERROR return CLIENT_INSTALL_ERROR
env['KRB5_CONFIG'] = krb_name env['KRB5_CONFIG'] = krb_name
@ -2761,7 +2763,8 @@ def install(options, env, fstore, statestore):
dnsok=dnsok, dnsok=dnsok,
options=options, options=options,
filename=paths.KRB5_CONF, filename=paths.KRB5_CONF,
client_domain=client_domain): client_domain=client_domain,
client_hostname=hostname):
return CLIENT_INSTALL_ERROR return CLIENT_INSTALL_ERROR
root_logger.info( root_logger.info(

1
install/share/krb5.conf.template
View File

@ -26,6 +26,7 @@ $OTHER_LIBDEFAULTS
[domain_realm] [domain_realm]
.$DOMAIN = $REALM .$DOMAIN = $REALM
$DOMAIN = $REALM $DOMAIN = $REALM
$FQDN = $REALM
$OTHER_DOMAIN_REALM_MAPS $OTHER_DOMAIN_REALM_MAPS
[dbmodules] [dbmodules]
$REALM = { $REALM = {