From 76eb7c221bd383a8d08433b0afca3ebb72628d11 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Thu, 10 Mar 2016 08:19:58 +0100 Subject: [PATCH 4/5] libipa_hbac: Move the library to src/lib/ipa_hbac Moving the library to the lib directory will force maintainers to think twice about changes, because it would be obvious this is a library. Also don't use includes from sssd source tree paths, but add the util path to Makefile's CFLAGS so that other projects can copy the hbac_evaluator.c file verbatim. --- Makefile.am | 18 +++++++++++------- configure.ac | 2 +- src/{providers/ipa => lib/ipa_hbac}/hbac_evaluator.c | 4 ++-- src/{providers/ipa => lib/ipa_hbac}/ipa_hbac.doxy.in | 0 src/{providers/ipa => lib/ipa_hbac}/ipa_hbac.exports | 0 src/{providers/ipa => lib/ipa_hbac}/ipa_hbac.h | 0 src/{providers/ipa => lib/ipa_hbac}/ipa_hbac.pc.in | 0 src/providers/ipa/ipa_access.c | 1 - src/providers/ipa/ipa_hbac_common.c | 1 - src/providers/ipa/ipa_hbac_private.h | 2 +- src/python/pyhbac.c | 2 +- src/tests/ipa_hbac-tests.c | 2 +- 12 files changed, 17 insertions(+), 15 deletions(-) rename src/{providers/ipa => lib/ipa_hbac}/hbac_evaluator.c (99%) rename src/{providers/ipa => lib/ipa_hbac}/ipa_hbac.doxy.in (100%) rename src/{providers/ipa => lib/ipa_hbac}/ipa_hbac.exports (100%) rename src/{providers/ipa => lib/ipa_hbac}/ipa_hbac.h (100%) rename src/{providers/ipa => lib/ipa_hbac}/ipa_hbac.pc.in (100%) diff --git a/Makefile.am b/Makefile.am index 2b1410116388f117b59a20c659cff6f65df936e7..481c6ad6f6b6257bdb5a845ffbb3b63920575fc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -939,18 +939,22 @@ lib_LTLIBRARIES = libipa_hbac.la \ libsss_nss_idmap.la \ $(NULL) -pkgconfig_DATA += src/providers/ipa/ipa_hbac.pc -libipa_hbac_la_DEPENDENCIES = src/providers/ipa/ipa_hbac.exports +pkgconfig_DATA += src/lib/ipa_hbac/ipa_hbac.pc +libipa_hbac_la_DEPENDENCIES = src/lib/ipa_hbac/ipa_hbac.exports libipa_hbac_la_SOURCES = \ - src/providers/ipa/hbac_evaluator.c \ + src/lib/ipa_hbac/hbac_evaluator.c \ src/util/sss_utf8.c +libipa_hbac_la_CFLAGS = \ + $(AM_CFLAGS) \ + -I$(top_srcdir)/src/util \ + $(NULL) libipa_hbac_la_LIBADD = \ $(UNICODE_LIBS) libipa_hbac_la_LDFLAGS = \ - -Wl,--version-script,$(srcdir)/src/providers/ipa/ipa_hbac.exports \ + -Wl,--version-script,$(srcdir)/src/lib/ipa_hbac/ipa_hbac.exports \ -version-info 1:0:1 -dist_noinst_DATA += src/providers/ipa/ipa_hbac.exports +dist_noinst_DATA += src/lib/ipa_hbac/ipa_hbac.exports pkgconfig_DATA += src/lib/idmap/sss_idmap.pc libsss_idmap_la_DEPENDENCIES = src/lib/idmap/sss_idmap.exports @@ -979,7 +983,7 @@ libsss_nss_idmap_la_LDFLAGS = \ dist_noinst_DATA += src/sss_client/idmap/sss_nss_idmap.exports include_HEADERS = \ - src/providers/ipa/ipa_hbac.h \ + src/lib/ipa_hbac/ipa_hbac.h \ src/lib/idmap/sss_idmap.h \ src/sss_client/idmap/sss_nss_idmap.h \ $(NULL) @@ -3554,7 +3558,7 @@ endif if HAVE_DOXYGEN docs: $(DOXYGEN) src/doxy.config - $(DOXYGEN) src/providers/ipa/ipa_hbac.doxy + $(DOXYGEN) src/lib/ipa_hbac/ipa_hbac.doxy $(DOXYGEN) src/lib/idmap/sss_idmap.doxy $(DOXYGEN) src/sss_client/idmap/sss_nss_idmap.doxy if BUILD_IFP diff --git a/configure.ac b/configure.ac index 9b674ba02b2348fe2e1d61ecfc3f5084098b0f23..2c36049ca04f57fe94f359c5dc19a506dd2b9388 100644 --- a/configure.ac +++ b/configure.ac @@ -443,7 +443,7 @@ AC_CONFIG_FILES([Makefile contrib/sssd.spec src/examples/rwtab src/doxy.config src/sysv/sssd src/sysv/gentoo/sssd src/sysv/SUSE/sssd po/Makefile.in src/man/Makefile src/tests/cwrap/Makefile src/tests/intg/Makefile - src/providers/ipa/ipa_hbac.pc src/providers/ipa/ipa_hbac.doxy + src/lib/ipa_hbac/ipa_hbac.pc src/lib/ipa_hbac/ipa_hbac.doxy src/lib/idmap/sss_idmap.pc src/lib/idmap/sss_idmap.doxy src/sss_client/idmap/sss_nss_idmap.pc src/sss_client/idmap/sss_nss_idmap.doxy diff --git a/src/providers/ipa/hbac_evaluator.c b/src/lib/ipa_hbac/hbac_evaluator.c similarity index 99% rename from src/providers/ipa/hbac_evaluator.c rename to src/lib/ipa_hbac/hbac_evaluator.c index 271b170faba36fc531c312c24061e7250d5ebe93..a71c453e3f07e9da407bb35e5e324cb27ba85e27 100644 --- a/src/providers/ipa/hbac_evaluator.c +++ b/src/lib/ipa_hbac/hbac_evaluator.c @@ -28,8 +28,8 @@ #include #include #include -#include "providers/ipa/ipa_hbac.h" -#include "util/sss_utf8.h" +#include "ipa_hbac.h" +#include "sss_utf8.h" #ifndef HAVE_ERRNO_T #define HAVE_ERRNO_T diff --git a/src/providers/ipa/ipa_hbac.doxy.in b/src/lib/ipa_hbac/ipa_hbac.doxy.in similarity index 100% rename from src/providers/ipa/ipa_hbac.doxy.in rename to src/lib/ipa_hbac/ipa_hbac.doxy.in diff --git a/src/providers/ipa/ipa_hbac.exports b/src/lib/ipa_hbac/ipa_hbac.exports similarity index 100% rename from src/providers/ipa/ipa_hbac.exports rename to src/lib/ipa_hbac/ipa_hbac.exports diff --git a/src/providers/ipa/ipa_hbac.h b/src/lib/ipa_hbac/ipa_hbac.h similarity index 100% rename from src/providers/ipa/ipa_hbac.h rename to src/lib/ipa_hbac/ipa_hbac.h diff --git a/src/providers/ipa/ipa_hbac.pc.in b/src/lib/ipa_hbac/ipa_hbac.pc.in similarity index 100% rename from src/providers/ipa/ipa_hbac.pc.in rename to src/lib/ipa_hbac/ipa_hbac.pc.in diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c index ad12f21fc36e52a2e8d7affcfc7128f018c50e4c..3ec5a8df8b2cdc027860ab808b26433142c13e24 100644 --- a/src/providers/ipa/ipa_access.c +++ b/src/providers/ipa/ipa_access.c @@ -30,7 +30,6 @@ #include "providers/ldap/sdap_access.h" #include "providers/ipa/ipa_common.h" #include "providers/ipa/ipa_access.h" -#include "providers/ipa/ipa_hbac.h" #include "providers/ipa/ipa_hosts.h" #include "providers/ipa/ipa_hbac_private.h" #include "providers/ipa/ipa_hbac_rules.h" diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c index 72a620ef0971a8bc657bd7bda3f61b4abdd614ee..82c531f15338a2ff609bd58ad449783d7a3a6af1 100644 --- a/src/providers/ipa/ipa_hbac_common.c +++ b/src/providers/ipa/ipa_hbac_common.c @@ -21,7 +21,6 @@ */ #include "providers/ipa/ipa_hbac_private.h" -#include "providers/ipa/ipa_hbac.h" #include "providers/ipa/ipa_common.h" static errno_t diff --git a/src/providers/ipa/ipa_hbac_private.h b/src/providers/ipa/ipa_hbac_private.h index c831cd5c6dd2ed1ff2bc0d649a25ae1212548dda..8fc5dc6d03cc2373e32641a399157c900ec18107 100644 --- a/src/providers/ipa/ipa_hbac_private.h +++ b/src/providers/ipa/ipa_hbac_private.h @@ -24,7 +24,7 @@ #define IPA_HBAC_PRIVATE_H_ #include "providers/ipa/ipa_access.h" -#include "providers/ipa/ipa_hbac.h" +#include "lib/ipa_hbac/ipa_hbac.h" #define IPA_HBAC_RULE "ipaHBACRule" diff --git a/src/python/pyhbac.c b/src/python/pyhbac.c index 820ef11b57f1226725fd7acf97598a42e6bf0bc0..eb424c6ddb8f7b44437079f0f9c7d63a583b7198 100644 --- a/src/python/pyhbac.c +++ b/src/python/pyhbac.c @@ -23,7 +23,7 @@ #include "util/util.h" #include "util/sss_python.h" -#include "providers/ipa/ipa_hbac.h" +#include "lib/ipa_hbac/ipa_hbac.h" #define PYTHON_MODULE_NAME "pyhbac" diff --git a/src/tests/ipa_hbac-tests.c b/src/tests/ipa_hbac-tests.c index f2192a6fbc5188a7a7f6b204e03ca5961bb53f75..c8ef7fe44d41770cfeca706e6d3396a8d0e7d6cf 100644 --- a/src/tests/ipa_hbac-tests.c +++ b/src/tests/ipa_hbac-tests.c @@ -27,7 +27,7 @@ #include #include "tests/common_check.h" -#include "providers/ipa/ipa_hbac.h" +#include "lib/ipa_hbac/ipa_hbac.h" #define HBAC_TEST_USER "testuser" #define HBAC_TEST_INVALID_USER "nosuchuser" -- 2.4.3