diff options
| author | Sumit Bose <sbose@redhat.com> | 2017-03-29 15:46:50 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2017-04-05 07:30:41 +0000 |
| commit | 6c2772dde52c84024d32533b29e6cbd04c69924a (patch) | |
| tree | b2486626f0e9e4f5da3a95e6b19b08d272630c3b | |
| parent | 5f5a3b29dba7cc736ba334aefb55484baeefeb76 (diff) | |
| download | freeipa-6c2772dde52c84024d32533b29e6cbd04c69924a.tar.gz freeipa-6c2772dde52c84024d32533b29e6cbd04c69924a.tar.xz freeipa-6c2772dde52c84024d32533b29e6cbd04c69924a.zip | |
IPA-KDB: use relative path in ipa-certmap config snippet
Architecture specific paths should be avoided in the global Kerberos
configuration because it is read e.g. by 32bit and 64bit libraries they
are installed in parallel.
Resolves https://pagure.io/freeipa/issue/6833
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
| -rw-r--r-- | daemons/ipa-kdb/Makefile.am | 12 | ||||
| -rw-r--r-- | daemons/ipa-kdb/ipa-certauth (renamed from daemons/ipa-kdb/ipa-certauth.in) | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am index 715666e77..259bc3b20 100644 --- a/daemons/ipa-kdb/Makefile.am +++ b/daemons/ipa-kdb/Makefile.am @@ -40,18 +40,16 @@ ipadb_la_SOURCES = \ ipa_kdb_audit_as.c \ $(NULL) +dist_noinst_DATA = ipa_kdb.exports + if BUILD_IPA_CERTAUTH_PLUGIN ipadb_la_SOURCES += ipa_kdb_certauth.c -%: %.in - sed \ - -e 's|@plugindir@|$(plugindir)|g' \ - '$(srcdir)/$@.in' >$@ - krb5confdir = $(sysconfdir)/krb5.conf.d krb5conf_DATA = ipa-certauth -CLEANFILES = $(krb5conf_DATA) +else +dist_noinst_DATA += ipa-certauth endif ipadb_la_LDFLAGS = \ @@ -105,8 +103,6 @@ ipa_kdb_tests_LDADD = \ -lsss_idmap \ $(NULL) -dist_noinst_DATA = ipa_kdb.exports ipa-certauth.in - clean-local: rm -f tests/.dirstamp diff --git a/daemons/ipa-kdb/ipa-certauth.in b/daemons/ipa-kdb/ipa-certauth index eda89a26f..6fde08284 100644 --- a/daemons/ipa-kdb/ipa-certauth.in +++ b/daemons/ipa-kdb/ipa-certauth @@ -1,5 +1,5 @@ [plugins] certauth = { - module = ipakdb:@plugindir@/ipadb.so + module = ipakdb:kdb/ipadb.so enable_only = ipakdb } |