diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2012-10-31 10:59:04 +0100 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-12-06 10:53:22 -0500 |
| commit | b64dc9362defcddd524d9168fe89c732e4c17054 (patch) | |
| tree | 381acc7116528d9c12666d45161703873797958e | |
| parent | daa22d4355f0b38d369276e9e7faa7a119ac4976 (diff) | |
| download | freeipa.git-b64dc9362defcddd524d9168fe89c732e4c17054.tar.gz freeipa.git-b64dc9362defcddd524d9168fe89c732e4c17054.tar.xz freeipa.git-b64dc9362defcddd524d9168fe89c732e4c17054.zip | |
Specify includedir in krb5.conf on new installs
https://fedorahosted.org/freeipa/ticket/3132
| -rw-r--r-- | freeipa.spec.in | 2 | ||||
| -rw-r--r-- | install/share/krb5.conf.template | 2 | ||||
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index 8a095db4..879ae995 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -63,7 +63,7 @@ BuildRequires: pylint BuildRequires: python-polib BuildRequires: libipa_hbac-python BuildRequires: python-memcached -BuildRequires: sssd >= 1.8.0 +BuildRequires: sssd >= 1.9.2 BuildRequires: python-lxml BuildRequires: python-pyasn1 >= 0.0.9a BuildRequires: python-dns diff --git a/install/share/krb5.conf.template b/install/share/krb5.conf.template index f8b1a6f0..ed30b9e0 100644 --- a/install/share/krb5.conf.template +++ b/install/share/krb5.conf.template @@ -1,3 +1,5 @@ +includedir /var/lib/sss/pubconf/krb5.include.d + [logging] default = FILE:/var/log/krb5libs.log kdc = FILE:/var/log/krb5kdc.log diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index cdcc6ad2..9e45589b 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: |