diff options
author | Jan Cholasta <[email protected]> | 2017-03-20 06:56:53 +0000 |
---|---|---|
committer | Martin Babinsky <[email protected]> | 2017-06-28 15:44:51 +0200 |
commit | d5fc0ddd874f6289c0fcf60a6a4147ca5b280700 (patch) | |
tree | 68a0f87fa4a6efd546965af80c12c3734dbf5103 /daemons | |
parent | d308abac2e6758014ebb39bcbd0fc3bd61a57db2 (diff) | |
download | freeipa-d5fc0ddd874f6289c0fcf60a6a4147ca5b280700.tar.gz freeipa-d5fc0ddd874f6289c0fcf60a6a4147ca5b280700.tar.xz freeipa-d5fc0ddd874f6289c0fcf60a6a4147ca5b280700.zip |
install: do not assume /etc/krb5.conf.d exists
Add `includedir /etc/krb5.conf.d` to /etc/krb5.conf only if
/etc/krb5.conf.d exists.
Do not rely on /etc/krb5.conf.d to enable the certauth plugin.
This fixes install on platforms which do not have /etc/krb5.conf.d.
https://pagure.io/freeipa/issue/6589
Reviewed-By: Martin Babinsky <[email protected]>
Reviewed-By: Christian Heimes <[email protected]>
Reviewed-By: Lukas Slebodnik <[email protected]>
Diffstat (limited to 'daemons')
-rw-r--r-- | daemons/ipa-kdb/Makefile.am | 6 | ||||
-rw-r--r-- | daemons/ipa-kdb/ipa-certauth | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am index 259bc3b20..5669349af 100644 --- a/daemons/ipa-kdb/Makefile.am +++ b/daemons/ipa-kdb/Makefile.am @@ -44,12 +44,6 @@ dist_noinst_DATA = ipa_kdb.exports if BUILD_IPA_CERTAUTH_PLUGIN ipadb_la_SOURCES += ipa_kdb_certauth.c - - -krb5confdir = $(sysconfdir)/krb5.conf.d -krb5conf_DATA = ipa-certauth -else -dist_noinst_DATA += ipa-certauth endif ipadb_la_LDFLAGS = \ diff --git a/daemons/ipa-kdb/ipa-certauth b/daemons/ipa-kdb/ipa-certauth deleted file mode 100644 index 6fde08284..000000000 --- a/daemons/ipa-kdb/ipa-certauth +++ /dev/null @@ -1,5 +0,0 @@ -[plugins] - certauth = { - module = ipakdb:kdb/ipadb.so - enable_only = ipakdb - } |