From cae66046bb31205283341cd3b19af799c5fe6a30 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Wed, 29 Mar 2017 15:46:50 +0200
Subject: [PATCH] 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>
---
daemons/ipa-kdb/Makefile.am | 12 ++++--------
daemons/ipa-kdb/{ipa-certauth.in => ipa-certauth} | 2 +-
2 files changed, 5 insertions(+), 9 deletions(-)
rename daemons/ipa-kdb/{ipa-certauth.in => ipa-certauth} (56%)
diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am
index 715666e779a4fa64c2c0f71767f09efb19b5f908..259bc3b20fa96cadff43c3acdce1bd3ba49cdb31 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
similarity index 56%
rename from daemons/ipa-kdb/ipa-certauth.in
rename to daemons/ipa-kdb/ipa-certauth
index eda89a26f02fbea449eb754b232b8115904acd21..6fde08284da22161a97df675d15392f80ffcc6fb 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
}
--
2.12.2