Skip to content

Commit

Permalink
DP: Remove old data provider interface
Browse files Browse the repository at this point in the history
Reverse data provider interface is moved to a better location in
NSS responder. All responders now can have an sbus interface
defined per data provider connection. The unused old data provider
interface is removed.

Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
  • Loading branch information
pbrezina authored and Lukas Slebodnik committed Aug 16, 2016
1 parent e07d700 commit 04e870d
Show file tree
Hide file tree
Showing 24 changed files with 259 additions and 357 deletions.
11 changes: 6 additions & 5 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,6 @@ SSSD_RESPONDER_OBJ = \
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_iface_generated.c \
src/providers/data_provider_req.c

SSSD_TOOLS_OBJ = \
Expand Down Expand Up @@ -610,6 +609,8 @@ dist_noinst_HEADERS = \
src/responder/nss/nsssrv_netgroup.h \
src/responder/nss/nsssrv_services.h \
src/responder/nss/nsssrv_mmap_cache.h \
src/responder/nss/nss_iface_generated.h \
src/responder/nss/nss_iface.h \
src/responder/pac/pacsrv.h \
src/responder/common/negcache_files.h \
src/responder/common/negcache.h \
Expand Down Expand Up @@ -647,7 +648,6 @@ dist_noinst_HEADERS = \
src/confdb/confdb_setup.h \
src/providers/data_provider.h \
src/providers/data_provider_req.h \
src/providers/data_provider_iface_generated.h \
src/providers/data_provider/dp.h \
src/providers/data_provider/dp_flags.h \
src/providers/data_provider/dp_responder_iface.h \
Expand Down Expand Up @@ -1196,10 +1196,10 @@ endif
CODEGEN_XML = \
$(srcdir)/src/tests/sbus_codegen_tests.xml \
$(srcdir)/src/monitor/monitor_iface.xml \
$(srcdir)/src/providers/data_provider_iface.xml \
$(srcdir)/src/providers/data_provider/dp_iface.xml \
$(srcdir)/src/providers/proxy/proxy_iface.xml \
$(srcdir)/src/responder/ifp/ifp_iface.xml
$(srcdir)/src/responder/ifp/ifp_iface.xml \
$(srcdir)/src/responder/nss/nss_iface.xml

SBUS_CODEGEN = src/sbus/sbus_codegen

Expand Down Expand Up @@ -1248,6 +1248,8 @@ sssd_nss_SOURCES = \
src/responder/nss/nsssrv_netgroup.c \
src/responder/nss/nsssrv_services.c \
src/responder/nss/nsssrv_mmap_cache.c \
src/responder/nss/nss_iface_generated.c \
src/responder/nss/nss_iface.c \
$(SSSD_RESPONDER_OBJ)
sssd_nss_LDADD = \
$(TDB_LIBS) \
Expand Down Expand Up @@ -1396,7 +1398,6 @@ sssd_be_SOURCES = \
src/providers/be_ptask.c \
src/providers/be_refresh.c \
src/monitor/monitor_iface_generated.c \
src/providers/data_provider_iface_generated.c \
src/providers/data_provider/dp.c \
src/providers/data_provider/dp_modules.c \
src/providers/data_provider/dp_targets.c \
Expand Down
1 change: 0 additions & 1 deletion src/providers/data_provider.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include "sss_client/sss_cli.h"
#include "util/authtok.h"
#include "providers/data_provider_req.h"
#include "providers/data_provider_iface_generated.h"

#define DATA_PROVIDER_VERSION 0x0001
#define DATA_PROVIDER_PIPE "private/sbus-dp"
Expand Down
7 changes: 4 additions & 3 deletions src/providers/data_provider/dp_target_id.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "providers/data_provider/dp_private.h"
#include "providers/data_provider/dp_iface.h"
#include "providers/backend.h"
#include "responder/nss/nss_iface.h"
#include "util/util.h"

#define FILTER_TYPE(str, type) {str "=", sizeof(str "=") - 1, type}
Expand Down Expand Up @@ -168,9 +169,9 @@ static void dp_req_initgr_pp(const char *req_name,
}

msg = dbus_message_new_method_call(NULL,
DP_PATH,
DATA_PROVIDER_REV_IFACE,
DATA_PROVIDER_REV_IFACE_INITGRCHECK);
NSS_MEMORYCACHE_PATH,
IFACE_NSS_MEMORYCACHE,
IFACE_NSS_MEMORYCACHE_UPDATEINITGROUPS);
if (msg == NULL) {
DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory?!\n");
return;
Expand Down
53 changes: 0 additions & 53 deletions src/providers/data_provider_iface.xml

This file was deleted.

98 changes: 0 additions & 98 deletions src/providers/data_provider_iface_generated.c

This file was deleted.

82 changes: 0 additions & 82 deletions src/providers/data_provider_iface_generated.h

This file was deleted.

13 changes: 1 addition & 12 deletions src/responder/autofs/autofssrv.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,6 @@ struct mon_cli_iface monitor_autofs_methods = {
.sysbusReconnect = NULL,
};

static struct data_provider_iface autofs_dp_methods = {
{ &data_provider_iface_meta, 0 },
.RegisterService = NULL,
.pamHandler = NULL,
.sudoHandler = NULL,
.autofsHandler = NULL,
.hostHandler = NULL,
.getDomains = NULL,
.getAccountInfo = NULL,
};

static errno_t
autofs_get_config(struct autofs_ctx *actx,
struct confdb_ctx *cdb)
Expand Down Expand Up @@ -130,7 +119,7 @@ autofs_process_init(TALLOC_CTX *mem_ctx,
SSS_AUTOFS_SBUS_SERVICE_VERSION,
&monitor_autofs_methods,
"autofs",
&autofs_dp_methods.vtable,
NULL,
autofs_connection_setup,
&rctx);
if (ret != EOK) {
Expand Down
8 changes: 2 additions & 6 deletions src/responder/common/responder.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,7 @@ struct mon_cli_iface;
typedef int (*connection_setup_t)(struct cli_ctx *cctx);

int sss_connection_setup(struct cli_ctx *cctx);
/*
* NOTE: We would like to use more strong typing for the @dp_vtable argument
* but can't since it accepts either a struct data_provider_iface
* or struct data_provider_rev_iface. So pass the base struct: sbus_vtable
*/

int sss_process_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct confdb_ctx *cdb,
Expand All @@ -181,7 +177,7 @@ int sss_process_init(TALLOC_CTX *mem_ctx,
uint16_t svc_version,
struct mon_cli_iface *monitor_intf,
const char *cli_name,
struct sbus_vtable *dp_intf,
struct sbus_iface_map *sbus_iface,
connection_setup_t conn_setup,
struct resp_ctx **responder_ctx);

Expand Down

0 comments on commit 04e870d

Please sign in to comment.