pgreco / rpms / ipa

Forked from forks/areguera/rpms/ipa 4 years ago
Clone

Blame SOURCES/0065-IPA-KDB-use-relative-path-in-ipa-certmap-config-snip.patch

ac7d03
From cae66046bb31205283341cd3b19af799c5fe6a30 Mon Sep 17 00:00:00 2001
ac7d03
From: Sumit Bose <sbose@redhat.com>
ac7d03
Date: Wed, 29 Mar 2017 15:46:50 +0200
ac7d03
Subject: [PATCH] IPA-KDB: use relative path in ipa-certmap config snippet
ac7d03
ac7d03
Architecture specific paths should be avoided in the global Kerberos
ac7d03
configuration because it is read e.g. by 32bit and 64bit libraries they
ac7d03
are installed in parallel.
ac7d03
ac7d03
Resolves https://pagure.io/freeipa/issue/6833
ac7d03
ac7d03
Reviewed-By: Christian Heimes <cheimes@redhat.com>
ac7d03
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
ac7d03
---
ac7d03
 daemons/ipa-kdb/Makefile.am                       | 12 ++++--------
ac7d03
 daemons/ipa-kdb/{ipa-certauth.in => ipa-certauth} |  2 +-
ac7d03
 2 files changed, 5 insertions(+), 9 deletions(-)
ac7d03
 rename daemons/ipa-kdb/{ipa-certauth.in => ipa-certauth} (56%)
ac7d03
ac7d03
diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am
ac7d03
index 715666e779a4fa64c2c0f71767f09efb19b5f908..259bc3b20fa96cadff43c3acdce1bd3ba49cdb31 100644
ac7d03
--- a/daemons/ipa-kdb/Makefile.am
ac7d03
+++ b/daemons/ipa-kdb/Makefile.am
ac7d03
@@ -40,18 +40,16 @@ ipadb_la_SOURCES = 		\
ac7d03
 	ipa_kdb_audit_as.c	\
ac7d03
 	$(NULL)
ac7d03
 
ac7d03
+dist_noinst_DATA = ipa_kdb.exports
ac7d03
+
ac7d03
 if BUILD_IPA_CERTAUTH_PLUGIN
ac7d03
 ipadb_la_SOURCES += ipa_kdb_certauth.c
ac7d03
 
ac7d03
 
ac7d03
-%: %.in
ac7d03
-	sed \
ac7d03
-		-e 's|@plugindir@|$(plugindir)|g' \
ac7d03
-		'$(srcdir)/$@.in' >$@
ac7d03
-
ac7d03
 krb5confdir = $(sysconfdir)/krb5.conf.d
ac7d03
 krb5conf_DATA = ipa-certauth
ac7d03
-CLEANFILES = $(krb5conf_DATA)
ac7d03
+else
ac7d03
+dist_noinst_DATA += ipa-certauth
ac7d03
 endif
ac7d03
 
ac7d03
 ipadb_la_LDFLAGS = 		\
ac7d03
@@ -105,8 +103,6 @@ ipa_kdb_tests_LDADD =          \
ac7d03
        -lsss_idmap             \
ac7d03
        $(NULL)
ac7d03
 
ac7d03
-dist_noinst_DATA = ipa_kdb.exports ipa-certauth.in
ac7d03
-
ac7d03
 clean-local:
ac7d03
 	rm -f tests/.dirstamp
ac7d03
 
ac7d03
diff --git a/daemons/ipa-kdb/ipa-certauth.in b/daemons/ipa-kdb/ipa-certauth
ac7d03
similarity index 56%
ac7d03
rename from daemons/ipa-kdb/ipa-certauth.in
ac7d03
rename to daemons/ipa-kdb/ipa-certauth
ac7d03
index eda89a26f02fbea449eb754b232b8115904acd21..6fde08284da22161a97df675d15392f80ffcc6fb 100644
ac7d03
--- a/daemons/ipa-kdb/ipa-certauth.in
ac7d03
+++ b/daemons/ipa-kdb/ipa-certauth
ac7d03
@@ -1,5 +1,5 @@
ac7d03
 [plugins]
ac7d03
  certauth = {
ac7d03
-  module = ipakdb:@plugindir@/ipadb.so
ac7d03
+  module = ipakdb:kdb/ipadb.so
ac7d03
   enable_only = ipakdb
ac7d03
  }
ac7d03
-- 
ac7d03
2.12.2
ac7d03