diff options
author | Stef Walter <stefw@redhat.com> | 2014-01-10 11:50:43 +0100 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-06-02 18:15:56 +0200 |
commit | 1214ced660d4e4764503b277b0d1195270133909 (patch) | |
tree | e69b150e63a51594e3d4e3592b7931a8ef66ff0d | |
parent | 9355f5e0b9294f38993763bb131368fb0a229a85 (diff) | |
download | sssd-1214ced660d4e4764503b277b0d1195270133909.tar.gz sssd-1214ced660d4e4764503b277b0d1195270133909.tar.xz sssd-1214ced660d4e4764503b277b0d1195270133909.zip |
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.
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-by: Sumit Bose <sbose@redhat.com>
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
(cherry picked from commit 3e7d7af1953410f3f009bf3b2e481a46fb80de83)
-rw-r--r-- | src/providers/data_provider.h | 1 | ||||
-rw-r--r-- | src/providers/data_provider_be.c | 2 | ||||
-rw-r--r-- | 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 77190fbdd..616ff9e16 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 212dc111b..df0e54293 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 9e1de0603..a99cc73bb 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, |