summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2012-10-31 10:59:04 +0100
committerRob Crittenden <rcritten@redhat.com>2012-12-06 10:53:22 -0500
commitb64dc9362defcddd524d9168fe89c732e4c17054 (patch)
tree381acc7116528d9c12666d45161703873797958e /ipa-client
parentdaa22d4355f0b38d369276e9e7faa7a119ac4976 (diff)
downloadfreeipa-b64dc9362defcddd524d9168fe89c732e4c17054.tar.gz
freeipa-b64dc9362defcddd524d9168fe89c732e4c17054.tar.xz
freeipa-b64dc9362defcddd524d9168fe89c732e4c17054.zip
Specify includedir in krb5.conf on new installs
https://fedorahosted.org/freeipa/ticket/3132
Diffstat (limited to 'ipa-client')
-rwxr-xr-xipa-client/ipa-install/ipa-client-install7
1 files changed, 6 insertions, 1 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index cdcc6ad29..9e45589b8 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -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: