URL: https://github.com/freeipa/freeipa/pull/672 Author: sumit-bose Title: #672: IPA-KDB: use relative path in ipa-certmap config snippet Action: opened
PR body: """ 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 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/672/head:pr672 git checkout pr672
From 54460a33d3d95dbcaec56bf45999a39c10da60ed Mon Sep 17 00:00:00 2001 From: Sumit Bose <sb...@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 --- daemons/ipa-kdb/Makefile.am | 12 ++++-------- daemons/ipa-kdb/ipa-certauth | 5 +++++ daemons/ipa-kdb/ipa-certauth.in | 5 ----- 3 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 daemons/ipa-kdb/ipa-certauth delete mode 100644 daemons/ipa-kdb/ipa-certauth.in diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am index 715666e..259bc3b 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 b/daemons/ipa-kdb/ipa-certauth new file mode 100644 index 0000000..6fde082 --- /dev/null +++ b/daemons/ipa-kdb/ipa-certauth @@ -0,0 +1,5 @@ +[plugins] + certauth = { + module = ipakdb:kdb/ipadb.so + enable_only = ipakdb + } diff --git a/daemons/ipa-kdb/ipa-certauth.in b/daemons/ipa-kdb/ipa-certauth.in deleted file mode 100644 index eda89a2..0000000 --- a/daemons/ipa-kdb/ipa-certauth.in +++ /dev/null @@ -1,5 +0,0 @@ -[plugins] - certauth = { - module = ipakdb:@plugindir@/ipadb.so - enable_only = ipakdb - }
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
