>From 8a9eeb64548823bbd79f7622572e3c4f0b19ebe4 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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Reviewed-by: Jakub Hrozek Reviewed-by: Sumit Bose Reviewed-by: Lukáš Slebodník Reviewed-by: Simo Sorce (cherry picked from commit 3e7d7af1953410f3f009bf3b2e481a46fb80de83) --- 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 77190fbdde9e253bf364b7ae9a242952adae7dbb..616ff9e162b16561ea9e5d36738ed8e808a1ba27 100644 --- a/src/providers/data_provider.h +++ b/src/providers/data_provider.h @@ -59,6 +59,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 212dc111b26eae9d8dc17eea4055a79c7febe017..df0e54293ea571e6083abf3b5e09ce0a8351f10b 100644 --- a/src/providers/data_provider_be.c +++ b/src/providers/data_provider_be.c @@ -852,7 +852,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 9e1de0603b0ab9c4c249b087cdd9caddb01ac6c1..a99cc73bb7ec2f41b5a57fc9802bc91ab4d284ec 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.9.0