>From b936c8477910c1459d092e40af88095830a7f3bc Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Fri, 10 Jan 2014 11:50:43 +0100 Subject: [PATCH 3/6] nss: Stop using one DBus interface with totally different methods This is an incorrect use of DBus, where we use a single interface name with completely different sets of methods. Easily fixed. Once the vtable stuff is in use then this would be automatically detected and fail to build. --- src/providers/data_provider.h | 1 + src/providers/data_provider_be.c | 2 +- src/responder/nss/nsssrv.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/providers/data_provider.h b/src/providers/data_provider.h index f88637c2d3dbd9bd9df8a94493c229fe75b48f41..c33445c9ead27638845e67f428c64f92879835a4 100644 --- a/src/providers/data_provider.h +++ b/src/providers/data_provider.h @@ -60,6 +60,7 @@ /* this is a reverse method sent from providers to * the nss responder to tell it to update the mmap * cache */ +#define DP_REV_INTERFACE "org.freedesktop.sssd.dataprovider_rev" #define DP_REV_METHOD_UPDATE_CACHE "updateCache" #define DP_REV_METHOD_INITGR_CHECK "initgrCheck" diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c index bfb776cae15cfe280ec315b36ef32213b1d8d5e1..2e64226938f84b79cdc462379cbe4c5b621ba1db 100644 --- a/src/providers/data_provider_be.c +++ b/src/providers/data_provider_be.c @@ -857,7 +857,7 @@ static void acctinfo_initgroups_callback(struct be_req *be_req, /* Set up null request */ msg = dbus_message_new_method_call(NULL, DP_PATH, - DP_INTERFACE, + DP_REV_INTERFACE, DP_REV_METHOD_INITGR_CHECK); if (!msg) { DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory?!\n"); diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c index 9d0c9969a0c6472f8dd4f3239003f59a32ece36a..d258dfc71f635d3c7a88ea525f278e48e2ba427b 100644 --- a/src/responder/nss/nsssrv.c +++ b/src/responder/nss/nsssrv.c @@ -379,7 +379,7 @@ static struct sbus_method nss_dp_methods[] = { }; struct sbus_interface nss_dp_interface = { - DP_INTERFACE, + DP_REV_INTERFACE, DP_PATH, SBUS_DEFAULT_VTABLE, nss_dp_methods, -- 1.8.5.3