summaryrefslogtreecommitdiffstats
path: root/src/monitor
diff options
context:
space:
mode:
Diffstat (limited to 'src/monitor')
-rw-r--r--src/monitor/monitor.c9
-rw-r--r--src/monitor/monitor_sbus.c8
2 files changed, 3 insertions, 14 deletions
diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
index afefe7f11..fef1a120f 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -2443,7 +2443,6 @@ static void init_timeout(struct tevent_context *ev,
*/
static int monitor_service_init(struct sbus_connection *conn, void *data)
{
- struct sbus_interface *intf;
struct mt_ctx *ctx;
struct mon_init_conn *mini;
struct timeval tv;
@@ -2474,12 +2473,8 @@ static int monitor_service_init(struct sbus_connection *conn, void *data)
return ENOMEM;
}
- intf = sbus_new_interface(conn, MON_SRV_PATH, &monitor_methods.vtable, mini);
- if (!intf) {
- return ENOMEM;
- }
-
- return sbus_conn_add_interface(conn, intf);
+ return sbus_conn_register_iface(conn, &monitor_methods.vtable,
+ MON_SRV_PATH, mini);
}
/* service_send_ping
diff --git a/src/monitor/monitor_sbus.c b/src/monitor/monitor_sbus.c
index 3e6fbff9b..426f02997 100644
--- a/src/monitor/monitor_sbus.c
+++ b/src/monitor/monitor_sbus.c
@@ -172,7 +172,6 @@ errno_t sss_monitor_init(TALLOC_CTX *mem_ctx,
{
errno_t ret;
char *sbus_address;
- struct sbus_interface *intf;
struct sbus_connection *conn;
/* Set up SBUS connection to the monitor */
@@ -190,12 +189,7 @@ errno_t sss_monitor_init(TALLOC_CTX *mem_ctx,
}
talloc_free(sbus_address);
- intf = sbus_new_interface(mem_ctx, MONITOR_PATH, &mon_iface->vtable, pvt);
- if (!intf) {
- ret = ENOMEM;
- } else {
- ret = sbus_conn_add_interface(conn, intf);
- }
+ ret = sbus_conn_register_iface(conn, &mon_iface->vtable, MONITOR_PATH, pvt);
if (ret != EOK) {
DEBUG(SSSDBG_FATAL_FAILURE, "Failed to export monitor client.\n");
return ret;