From 4169fb26ea2ff93c19ecdad6e09382732ea5deeb Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Oct 20 2016 07:56:38 +0000 Subject: cache_req: switch to new code This patch switch the old switch-based cache req code to the new plugin-based. Reviewed-by: Jakub Hrozek --- diff --git a/Makefile.am b/Makefile.am index b5f300a..7ef2331 100644 --- a/Makefile.am +++ b/Makefile.am @@ -483,6 +483,23 @@ AM_CPPFLAGS = \ EXTRA_DIST = +SSSD_CACHE_REQ_OBJ = \ + src/responder/common/cache_req/cache_req.c \ + src/responder/common/cache_req/cache_req_search.c \ + src/responder/common/cache_req/cache_req_data.c \ + src/responder/common/cache_req/plugins/cache_req_user_by_name.c \ + src/responder/common/cache_req/plugins/cache_req_user_by_upn.c \ + src/responder/common/cache_req/plugins/cache_req_user_by_id.c \ + src/responder/common/cache_req/plugins/cache_req_user_by_filter.c \ + src/responder/common/cache_req/plugins/cache_req_user_by_cert.c \ + src/responder/common/cache_req/plugins/cache_req_group_by_name.c \ + src/responder/common/cache_req/plugins/cache_req_group_by_id.c \ + src/responder/common/cache_req/plugins/cache_req_group_by_filter.c \ + src/responder/common/cache_req/plugins/cache_req_initgroups_by_name.c \ + src/responder/common/cache_req/plugins/cache_req_initgroups_by_upn.c \ + src/responder/common/cache_req/plugins/cache_req_object_by_sid.c \ + $(NULL) + SSSD_RESPONDER_OBJ = \ src/responder/common/negcache_files.c \ src/responder/common/negcache.c \ @@ -492,11 +509,12 @@ SSSD_RESPONDER_OBJ = \ src/responder/common/responder_packet.c \ src/responder/common/responder_get_domains.c \ src/responder/common/responder_utils.c \ - src/responder/common/responder_cache_req.c \ src/responder/common/data_provider/rdp_message.c \ src/responder/common/data_provider/rdp_client.c \ src/monitor/monitor_iface_generated.c \ - src/providers/data_provider_req.c + src/providers/data_provider_req.c \ + $(SSSD_CACHE_REQ_OBJ) \ + $(NULL) SSSD_TOOLS_OBJ = \ src/tools/sss_sync_ops.c \ @@ -604,7 +622,9 @@ dist_noinst_HEADERS = \ src/responder/common/responder.h \ src/responder/common/responder_packet.h \ src/responder/common/responder_sbus.h \ - src/responder/common/responder_cache_req.h \ + src/responder/common/cache_req/cache_req.h \ + src/responder/common/cache_req/cache_req_plugin.h \ + src/responder/common/cache_req/cache_req_private.h \ src/responder/common/data_provider/rdp.h \ src/responder/pam/pamsrv.h \ src/responder/pam/pam_helpers.h \ @@ -2102,7 +2122,8 @@ TEST_MOCK_RESP_OBJ = \ src/responder/common/data_provider/rdp_message.c \ src/responder/common/data_provider/rdp_client.c \ src/responder/common/responder_utils.c \ - src/responder/common/responder_cache_req.c + $(SSSD_CACHE_REQ_OBJ) \ + $(NULL) TEST_MOCK_PROVIDER_OBJ = \ src/util/sss_sockets.c \ diff --git a/src/responder/ifp/ifp_groups.c b/src/responder/ifp/ifp_groups.c index 29aebe4..a54a4fa 100644 --- a/src/responder/ifp/ifp_groups.c +++ b/src/responder/ifp/ifp_groups.c @@ -26,7 +26,7 @@ #include "util/strtonum.h" #include "sbus/sssd_dbus_errors.h" #include "responder/common/responder.h" -#include "responder/common/responder_cache_req.h" +#include "responder/common/cache_req/cache_req.h" #include "responder/ifp/ifp_groups.h" #include "responder/ifp/ifp_users.h" #include "responder/ifp/ifp_cache.h" diff --git a/src/responder/ifp/ifp_users.c b/src/responder/ifp/ifp_users.c index a2bafff..1f90425 100644 --- a/src/responder/ifp/ifp_users.c +++ b/src/responder/ifp/ifp_users.c @@ -28,7 +28,7 @@ #include "util/cert.h" #include "sbus/sssd_dbus_errors.h" #include "responder/common/responder.h" -#include "responder/common/responder_cache_req.h" +#include "responder/common/cache_req/cache_req.h" #include "responder/ifp/ifp_users.h" #include "responder/ifp/ifp_groups.h" #include "responder/ifp/ifp_cache.h" diff --git a/src/responder/ifp/ifpsrv_cmd.c b/src/responder/ifp/ifpsrv_cmd.c index 97fad47..a54753a 100644 --- a/src/responder/ifp/ifpsrv_cmd.c +++ b/src/responder/ifp/ifpsrv_cmd.c @@ -23,7 +23,7 @@ #include "db/sysdb.h" #include "responder/ifp/ifp_private.h" -#include "responder/common/responder_cache_req.h" +#include "responder/common/cache_req/cache_req.h" struct ifp_attr_req { const char *name; diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c index 48d8416..f83b21a 100644 --- a/src/responder/nss/nsssrv_cmd.c +++ b/src/responder/nss/nsssrv_cmd.c @@ -30,7 +30,7 @@ #include "responder/nss/nsssrv_services.h" #include "responder/nss/nsssrv_mmap_cache.h" #include "responder/common/negcache.h" -#include "responder/common/responder_cache_req.h" +#include "responder/common/cache_req/cache_req.h" #include "providers/data_provider.h" #include "confdb/confdb.h" #include "db/sysdb.h" diff --git a/src/responder/pac/pacsrv_cmd.c b/src/responder/pac/pacsrv_cmd.c index c9514cf..6627915 100644 --- a/src/responder/pac/pacsrv_cmd.c +++ b/src/responder/pac/pacsrv_cmd.c @@ -22,7 +22,7 @@ #include "util/util.h" #include "responder/pac/pacsrv.h" -#include "responder/common/responder_cache_req.h" +#include "responder/common/cache_req/cache_req.h" #include "confdb/confdb.h" #include "providers/ad/ad_pac.h" diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c index e52fc76..de3b4ca 100644 --- a/src/responder/pam/pamsrv_cmd.c +++ b/src/responder/pam/pamsrv_cmd.c @@ -31,7 +31,7 @@ #include "providers/data_provider.h" #include "responder/pam/pamsrv.h" #include "responder/pam/pam_helpers.h" -#include "responder/common/responder_cache_req.h" +#include "responder/common/cache_req/cache_req.h" #include "db/sysdb.h" enum pam_verbosity { diff --git a/src/responder/sudo/sudosrv_get_sudorules.c b/src/responder/sudo/sudosrv_get_sudorules.c index 92a09f2..3b3c71c 100644 --- a/src/responder/sudo/sudosrv_get_sudorules.c +++ b/src/responder/sudo/sudosrv_get_sudorules.c @@ -28,7 +28,7 @@ #include "util/util.h" #include "db/sysdb_sudo.h" -#include "responder/common/responder_cache_req.h" +#include "responder/common/cache_req/cache_req.h" #include "responder/sudo/sudosrv_private.h" #include "providers/data_provider.h" diff --git a/src/tests/cmocka/test_responder_cache_req.c b/src/tests/cmocka/test_responder_cache_req.c index eba7406..1598f0c 100644 --- a/src/tests/cmocka/test_responder_cache_req.c +++ b/src/tests/cmocka/test_responder_cache_req.c @@ -26,7 +26,7 @@ #include "tests/cmocka/common_mock.h" #include "tests/cmocka/common_mock_resp.h" #include "db/sysdb.h" -#include "responder/common/responder_cache_req.h" +#include "responder/common/cache_req/cache_req.h" #define TESTS_PATH "tp_" BASE_FILE_STEM #define TEST_CONF_DB "test_responder_cache_req_conf.ldb" diff --git a/src/tests/cwrap/Makefile.am b/src/tests/cwrap/Makefile.am index 3e40cba..ba510ec 100644 --- a/src/tests/cwrap/Makefile.am +++ b/src/tests/cwrap/Makefile.am @@ -36,6 +36,23 @@ SSSD_LIBS = \ $(OPENLDAP_LIBS) \ $(TDB_LIBS) +SSSD_CACHE_REQ_OBJ = \ + ../../../src/responder/common/cache_req/cache_req.c \ + ../../../src/responder/common/cache_req/cache_req_search.c \ + ../../../src/responder/common/cache_req/cache_req_data.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_user_by_name.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_user_by_upn.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_user_by_id.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_user_by_filter.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_user_by_cert.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_group_by_name.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_group_by_id.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_group_by_filter.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_initgroups_by_name.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_initgroups_by_upn.c \ + ../../../src/responder/common/cache_req/plugins/cache_req_object_by_sid.c \ + $(NULL) + SSSD_RESPONDER_OBJ = \ ../../../src/responder/common/negcache_files.c \ ../../../src/responder/common/negcache.c \ @@ -45,11 +62,12 @@ SSSD_RESPONDER_OBJ = \ ../../../src/responder/common/responder_packet.c \ ../../../src/responder/common/responder_get_domains.c \ ../../../src/responder/common/responder_utils.c \ - ../../../src/responder/common/responder_cache_req.c \ ../../../src/responder/common/data_provider/rdp_message.c \ ../../../src/responder/common/data_provider/rdp_client.c \ ../../../src/monitor/monitor_iface_generated.c \ - ../../../src/providers/data_provider_req.c + ../../../src/providers/data_provider_req.c \ + $(SSSD_CACHE_REQ_OBJ) \ + $(NULL) dist_noinst_DATA = \ group \