diff options
Diffstat (limited to 'src/monitor')
| -rw-r--r-- | src/monitor/monitor.c | 18 | ||||
| -rw-r--r-- | src/monitor/monitor_interfaces.h | 17 | ||||
| -rw-r--r-- | src/monitor/monitor_sbus.c | 4 |
3 files changed, 11 insertions, 28 deletions
diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index c2e5a5af..ecfa95cf 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -752,7 +752,7 @@ static int service_signal(struct mt_svc *svc, const char *svc_signal) msg = dbus_message_new_method_call(NULL, MONITOR_PATH, - MONITOR_INTERFACE, + MON_CLI_IFACE, svc_signal); if (msg == NULL) { DEBUG(SSSDBG_FATAL_FAILURE, @@ -772,27 +772,27 @@ static int service_signal(struct mt_svc *svc, const char *svc_signal) static int service_signal_dns_reload(struct mt_svc *svc) { - return service_signal(svc, MON_CLI_METHOD_RES_INIT); + return service_signal(svc, MON_CLI_IFACE_RESINIT); } static int service_signal_offline(struct mt_svc *svc) { - return service_signal(svc, MON_CLI_METHOD_OFFLINE); + return service_signal(svc, MON_CLI_IFACE_GOOFFLINE); } static int service_signal_reset_offline(struct mt_svc *svc) { - return service_signal(svc, MON_CLI_METHOD_RESET_OFFLINE); + return service_signal(svc, MON_CLI_IFACE_RESETOFFLINE); } static int service_signal_rotate(struct mt_svc *svc) { - return service_signal(svc, MON_CLI_METHOD_ROTATE); + return service_signal(svc, MON_CLI_IFACE_ROTATELOGS); } static int service_signal_clear_memcache(struct mt_svc *svc) { - return service_signal(svc, MON_CLI_METHOD_CLEAR_MEMCACHE); + return service_signal(svc, MON_CLI_IFACE_CLEARMEMCACHE); } static int service_signal_clear_enum_cache(struct mt_svc *svc) { - return service_signal(svc, MON_CLI_METHOD_CLEAR_ENUM_CACHE); + return service_signal(svc, MON_CLI_IFACE_CLEARENUMCACHE); } static int check_domain_ranges(struct sss_domain_info *domains) @@ -2392,8 +2392,8 @@ static int service_send_ping(struct mt_svc *svc) */ msg = dbus_message_new_method_call(NULL, MONITOR_PATH, - MONITOR_INTERFACE, - MON_CLI_METHOD_PING); + MON_CLI_IFACE, + MON_CLI_IFACE_PING); if (!msg) { DEBUG(SSSDBG_FATAL_FAILURE,"Out of memory?!\n"); talloc_zfree(svc->conn); diff --git a/src/monitor/monitor_interfaces.h b/src/monitor/monitor_interfaces.h index 308642f7..ef4254a5 100644 --- a/src/monitor/monitor_interfaces.h +++ b/src/monitor/monitor_interfaces.h @@ -29,26 +29,9 @@ /*** Monitor SRV Interface ***/ #define MON_SRV_PATH "/org/freedesktop/sssd/monitor" -#define MON_SRV_INTERFACE "org.freedesktop.sssd.monitor" - -/* Monitor SRV Methods */ -#define MON_SRV_METHOD_VERSION "getVersion" -#define MON_SRV_METHOD_REGISTER "RegisterService" /*** Monitor CLI Interface ***/ #define MONITOR_PATH "/org/freedesktop/sssd/service" -#define MONITOR_INTERFACE "org.freedesktop.sssd.service" - -/* Monitor CLI Methods */ -#define MON_CLI_METHOD_IDENTITY "getIdentity" -#define MON_CLI_METHOD_PING "ping" -#define MON_CLI_METHOD_SHUTDOWN "shutDown" -#define MON_CLI_METHOD_RES_INIT "resInit" -#define MON_CLI_METHOD_OFFLINE "goOffline" /* Applicable only to providers */ -#define MON_CLI_METHOD_RESET_OFFLINE "resetOffline" /* Applicable only to providers */ -#define MON_CLI_METHOD_ROTATE "rotateLogs" -#define MON_CLI_METHOD_CLEAR_MEMCACHE "clearMemcache" -#define MON_CLI_METHOD_CLEAR_ENUM_CACHE "clearEnumCache" #define SSSD_SERVICE_PIPE "private/sbus-monitor" diff --git a/src/monitor/monitor_sbus.c b/src/monitor/monitor_sbus.c index 4b0e221e..b1550bcd 100644 --- a/src/monitor/monitor_sbus.c +++ b/src/monitor/monitor_sbus.c @@ -119,8 +119,8 @@ int monitor_common_send_id(struct sbus_connection *conn, /* create the message */ msg = dbus_message_new_method_call(NULL, MON_SRV_PATH, - MON_SRV_INTERFACE, - MON_SRV_METHOD_REGISTER); + MON_SRV_IFACE, + MON_SRV_IFACE_REGISTERSERVICE); if (msg == NULL) { DEBUG(SSSDBG_FATAL_FAILURE, "Out of memory?!\n"); return ENOMEM; |