Specify includedir in krb5.conf on new installs

https://fedorahosted.org/freeipa/ticket/3132
This commit is contained in:
Jakub Hrozek
2012-10-31 10:59:04 +01:00
committed by Rob Crittenden
parent daa22d4355
commit b64dc9362d
3 changed files with 9 additions and 2 deletions

View File

@@ -723,7 +723,7 @@ def configure_krb5_conf(cli_realm, cli_domain, cli_server, cli_kdc, dnsok,
options, filename, client_domain):
krbconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer")
krbconf.setOptionAssignment(" = ")
krbconf.setOptionAssignment((" = ", " "))
krbconf.setSectionNameDelimiters(("[","]"))
krbconf.setSubSectionDelimiters(("{","}"))
krbconf.setIndent((""," "," "))
@@ -731,6 +731,11 @@ def configure_krb5_conf(cli_realm, cli_domain, cli_server, cli_kdc, dnsok,
opts = [{'name':'comment', 'type':'comment', 'value':'File modified by ipa-client-install'},
{'name':'empty', 'type':'empty'}]
# SSSD include dir
if options.sssd:
opts.append({'name':'includedir', 'type':'option', 'value':'/var/lib/sss/pubconf/krb5.include.d/', 'delim':' '})
opts.append({'name':'empty', 'type':'empty'})
#[libdefaults]
libopts = [{'name':'default_realm', 'type':'option', 'value':cli_realm}]
if not dnsok or not cli_kdc or options.force: