diff options
| author | Sumit Bose <sbose@redhat.com> | 2009-02-13 14:09:21 +0100 |
|---|---|---|
| committer | Sumit Bose <sbose@redhat.com> | 2009-02-24 11:31:08 +0100 |
| commit | 183c99ad1e01147e21579327d3a46b8fa4581863 (patch) | |
| tree | d85cf782ef00a6061cb310bb907a7a6d4c074ea1 | |
| parent | 1ca718c02a12dd5d8095e0f332956472059337fa (diff) | |
| download | sssd-183c99ad1e01147e21579327d3a46b8fa4581863.tar.gz sssd-183c99ad1e01147e21579327d3a46b8fa4581863.tar.xz sssd-183c99ad1e01147e21579327d3a46b8fa4581863.zip | |
fixes after rebase
| -rw-r--r-- | server/Makefile.in | 3 | ||||
| -rw-r--r-- | server/providers/data_provider_be.c | 31 | ||||
| -rw-r--r-- | server/server.mk | 4 |
3 files changed, 31 insertions, 7 deletions
diff --git a/server/Makefile.in b/server/Makefile.in index 6b5d12e10..7b85d2443 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -78,7 +78,7 @@ DBUS_SYSBUS_POLICY_DIR = @sysbuspath@ LIBEXECBINS = sbin/sssd_nss sbin/sssd_dp sbin/sssd_be sbin/sssd_info sbin/sssd_pk sbin/sssd_pam DBUS_SYSBUS_POLICIES = infopipe/org.freeipa.sssd.infopipe.conf BINS = sbin/sssd $(LIBEXECBINS) -SOLIBS = lib/libsss_proxy.$(SHLIBEXT) lib/memberof.$(SHLIBEXT) +SOLIBS = lib/libsss_proxy.$(SHLIBEXT) lib/libsss_ldap.$(SHLIBEXT) lib/memberof.$(SHLIBEXT) TESTS = tests/sysdb-tests DIRS = sbin lib @@ -111,6 +111,7 @@ install:: all installdirs installheaders installlibs installbin installsupport ${INSTALLCMD} -d $(DESTDIR)$(SSSD_LIBEXEC_PATH) ${INSTALLCMD} -m 755 $(LIBEXECBINS) $(DESTDIR)$(SSSD_LIBEXEC_PATH) ${INSTALLCMD} -m 755 lib/libsss_proxy.$(SHLIBEXT) $(DESTDIR)$(libdir) + ${INSTALLCMD} -m 755 lib/libsss_ldap.$(SHLIBEXT) $(DESTDIR)$(libdir) ${INSTALLCMD} -m 755 lib/memberof.$(SHLIBEXT) $(DESTDIR)$(libdir) installdirs:: diff --git a/server/providers/data_provider_be.c b/server/providers/data_provider_be.c index 32897e4c6..2b05b1446 100644 --- a/server/providers/data_provider_be.c +++ b/server/providers/data_provider_be.c @@ -596,9 +596,34 @@ static int mon_cli_init(struct be_ctx *ctx) * sbus channel to the data provider daemon */ static int be_cli_init(struct be_ctx *ctx) { - return dp_sbus_cli_init(ctx, ctx->ev, ctx->cdb, - be_methods, ctx, NULL, - &ctx->dp_ctx); + int ret; + char *sbus_address; + struct sbus_method_ctx *sm_ctx; + + /* Set up SBUS connection to the monitor */ + ret = dp_get_sbus_address(ctx, ctx->cdb, &sbus_address); + if (ret != EOK) { + DEBUG(0, ("Could not locate monitor address.\n")); + return ret; + } + + ret = dp_init_sbus_methods(ctx, be_methods, &sm_ctx); + if (ret != EOK) { + DEBUG(0, ("Could not initialize SBUS methods.\n")); + return ret; + } + + ret = sbus_client_init(ctx, ctx->ev, + sbus_address, sm_ctx, + ctx /* Private Data */, + NULL /* Destructor */, + &ctx->dp_ctx); + if (ret != EOK) { + DEBUG(0, ("Failed to connect to monitor services.\n")); + return ret; + } + + return EOK; } static int load_backend(struct be_ctx *ctx) diff --git a/server/server.mk b/server/server.mk index 607676d03..7f9665905 100644 --- a/server/server.mk +++ b/server/server.mk @@ -4,7 +4,6 @@ UTIL_OBJ = \ util/server.o \ util/memory.o \ util/btreemap.o \ - util/ssssrv_packet.o \ monitor/monitor_sbus.o \ providers/dp_sbus.o \ sbus/sssd_dbus_common.o \ @@ -28,7 +27,6 @@ DP_OBJ = \ providers/data_provider.o DP_BE_OBJ = \ - providers/dp_helpers.o \ providers/data_provider_be.o \ PROXY_BE_OBJ = \ @@ -71,7 +69,7 @@ sbin/sssd_nss: $(NSSSRV_OBJ) $(UTIL_OBJ) $(CC) -o sbin/sssd_nss $(NSSSRV_OBJ) $(UTIL_OBJ) $(LDFLAGS) $(LIBS) sbin/sssd_pam: $(PAMSRV_OBJ) $(UTIL_OBJ) $(SSSSERV_UTIL_OBJ) - $(CC) -o sbin/sssd_pam $(PAMSRV_OBJ) $(UTIL_OBJ) $(SSSSERV_UTIL_OBJ) $(LDFLAGS) $(LIBS) + $(CC) -o sbin/sssd_pam $(PAMSRV_OBJ) $(UTIL_OBJ) $(SSSSERV_UTIL_OBJ) -lsysdb $(LDFLAGS) $(LIBS) sbin/sssd_dp: $(DP_OBJ) $(UTIL_OBJ) $(CC) -o sbin/sssd_dp $(DP_OBJ) $(UTIL_OBJ) $(LDFLAGS) $(LIBS) |