MONITOR: Remove deprecated pong sbus method

The pong method is deprecated since we started using the watchdog. Since
this is dead code, it makes sense to just remove it.

Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>

5 files changed, 0 insertions, 19 deletions

diff --git a/src/monitor/monitor_iface.xml b/src/monitor/monitor_iface.xml
index 5d6b16f32..585209a55 100644
--- a/src/monitor/monitor_iface.xml
+++ b/src/monitor/monitor_iface.xml
@@ -15,10 +15,6 @@
 
     <interface name="org.freedesktop.sssd.service">
         <annotation value="mon_cli_iface" name="org.freedesktop.DBus.GLib.CSymbol"/>
-        <method name="ping"> <!-- deprecated -->
-            <!-- no arguments, raw handler -->
-            <annotation name="org.freedesktop.sssd.RawHandler" value="true"/>
-        </method>
         <method name="resInit">
             <!-- no arguments, raw handler -->
             <annotation name="org.freedesktop.sssd.RawHandler" value="true"/>
diff --git a/src/monitor/monitor_iface_generated.c b/src/monitor/monitor_iface_generated.c
index 171cef7e6..a39f6a68a 100644
--- a/src/monitor/monitor_iface_generated.c
+++ b/src/monitor/monitor_iface_generated.c
@@ -37,13 +37,6 @@ const struct sbus_interface_meta mon_srv_iface_meta = {
 /* methods for org.freedesktop.sssd.service */
 const struct sbus_method_meta mon_cli_iface__methods[] = {
     {
-        "ping", /* name */
-        NULL, /* no in_args */
-        NULL, /* no out_args */
-        offsetof(struct mon_cli_iface, ping),
-        NULL, /* no invoker */
-    },
-    {
         "resInit", /* name */
         NULL, /* no in_args */
         NULL, /* no out_args */
diff --git a/src/monitor/monitor_iface_generated.h b/src/monitor/monitor_iface_generated.h
index f93f11731..70958b9d1 100644
--- a/src/monitor/monitor_iface_generated.h
+++ b/src/monitor/monitor_iface_generated.h
@@ -18,7 +18,6 @@
 
 /* constants for org.freedesktop.sssd.service */
 #define MON_CLI_IFACE "org.freedesktop.sssd.service"
-#define MON_CLI_IFACE_PING "ping"
 #define MON_CLI_IFACE_RESINIT "resInit"
 #define MON_CLI_IFACE_SHUTDOWN "shutDown"
 #define MON_CLI_IFACE_GOOFFLINE "goOffline"
@@ -56,7 +55,6 @@ struct mon_srv_iface {
 /* vtable for org.freedesktop.sssd.service */
 struct mon_cli_iface {
     struct sbus_vtable vtable; /* derive from sbus_vtable */
-    sbus_msg_handler_fn ping;
     sbus_msg_handler_fn resInit;
     sbus_msg_handler_fn shutDown;
     sbus_msg_handler_fn goOffline;
diff --git a/src/monitor/monitor_interfaces.h b/src/monitor/monitor_interfaces.h
index 213f293cf..8a9e4fe94 100644
--- a/src/monitor/monitor_interfaces.h
+++ b/src/monitor/monitor_interfaces.h
@@ -38,7 +38,6 @@
 int monitor_get_sbus_address(TALLOC_CTX *mem_ctx, char **address);
 int monitor_common_send_id(struct sbus_connection *conn,
                            const char *name, uint16_t version);
-int monitor_common_pong(struct sbus_request *dbus_req, void *data);
 int monitor_common_res_init(struct sbus_request *dbus_req, void *data);
 
 errno_t sss_monitor_init(TALLOC_CTX *mem_ctx,
diff --git a/src/monitor/monitor_sbus.c b/src/monitor/monitor_sbus.c
index 426f02997..cc25c404c 100644
--- a/src/monitor/monitor_sbus.c
+++ b/src/monitor/monitor_sbus.c
@@ -144,11 +144,6 @@ int monitor_common_send_id(struct sbus_connection *conn,
     return retval;
 }
 
-int monitor_common_pong(struct sbus_request *dbus_req, void *data)
-{
-    return sbus_request_return_and_finish(dbus_req, DBUS_TYPE_INVALID);
-}
-
 int monitor_common_res_init(struct sbus_request *dbus_req, void *data)
 {
     int ret;