Remove redundant memory contexts

Simplify code by removing stuff that is never used or redundant.

3 files changed, 45 insertions, 34 deletions

diff --git a/server/providers/data_provider.c b/server/providers/data_provider.c
index 4dc9dfaa8..6a19247fd 100644
--- a/server/providers/data_provider.c
+++ b/server/providers/data_provider.c
@@ -55,7 +55,6 @@ struct dp_frontend;
 struct dp_ctx {
     struct tevent_context *ev;
     struct confdb_ctx *cdb;
-    struct service_sbus_ctx *ss_ctx;
     struct sbus_srv_ctx *sbus_srv;
     struct dp_backend *be_list;
     struct dp_frontend *fe_list;
@@ -195,10 +194,10 @@ static int service_res_init(DBusMessage *message, struct sbus_conn_ctx *sconn)
 
 static int dp_monitor_init(struct dp_ctx *dpctx)
 {
-    int ret;
-    char *sbus_address;
-    struct service_sbus_ctx *ss_ctx;
+    struct sbus_conn_ctx *conn_ctx;
     struct sbus_method_ctx *sm_ctx;
+    char *sbus_address;
+    int ret;
 
     /* Set up SBUS connection to the monitor */
     ret = monitor_get_sbus_address(dpctx, dpctx->cdb, &sbus_address);
@@ -213,11 +212,15 @@ static int dp_monitor_init(struct dp_ctx *dpctx)
         return ret;
     }
 
-    ret = sbus_client_init(dpctx, dpctx->ev,
-                           sbus_address, sm_ctx,
-                           NULL /* Private Data */,
-                           NULL /* Destructor */,
-                           &ss_ctx);
+    /* FIXME: remove this */
+    if (talloc_reference(dpctx, sm_ctx) == NULL) {
+        DEBUG(0, ("Failed to take memory reference\n"));
+        return ENOMEM;
+    }
+
+    ret = sbus_client_init(dpctx, dpctx->ev, sm_ctx,
+                           sbus_address, &conn_ctx,
+                           NULL, NULL);
     if (ret != EOK) {
         DEBUG(0, ("Failed to connect to monitor services.\n"));
         return ret;
@@ -226,8 +229,6 @@ static int dp_monitor_init(struct dp_ctx *dpctx)
     /* Set up DP-specific listeners */
     /* None currently used */
 
-    dpctx->ss_ctx = ss_ctx;
-
     return EOK;
 }
 
diff --git a/server/providers/data_provider_be.c b/server/providers/data_provider_be.c
index 2e0c1cf23..d5cd6dd0a 100644
--- a/server/providers/data_provider_be.c
+++ b/server/providers/data_provider_be.c
@@ -274,7 +274,7 @@ static void online_chk_callback(struct be_req *req, int status,
         return;
     }
 
-    conn = sbus_get_connection(req->be_ctx->dp_ctx->scon_ctx);
+    conn = sbus_get_connection(req->be_ctx->dp_conn_ctx);
     dbus_connection_send(conn, reply, NULL);
     dbus_message_unref(reply);
 
@@ -393,7 +393,7 @@ static void acctinfo_callback(struct be_req *req, int status,
         return;
     }
 
-    conn = sbus_get_connection(req->be_ctx->dp_ctx->scon_ctx);
+    conn = sbus_get_connection(req->be_ctx->dp_conn_ctx);
     dbus_connection_send(conn, reply, NULL);
     dbus_message_unref(reply);
 
@@ -559,7 +559,7 @@ static void be_pam_handler_callback(struct be_req *req, int status,
         return;
     }
 
-    conn = sbus_get_connection(req->be_ctx->dp_ctx->scon_ctx);
+    conn = sbus_get_connection(req->be_ctx->dp_conn_ctx);
     dbus_connection_send(conn, reply, NULL);
     dbus_message_unref(reply);
 
@@ -671,9 +671,8 @@ done:
  * sbus channel to the monitor daemon */
 static int mon_cli_init(struct be_ctx *ctx)
 {
-    int ret;
     char *sbus_address;
-    struct sbus_method_ctx *sm_ctx;
+    int ret;
 
     /* Set up SBUS connection to the monitor */
     ret = monitor_get_sbus_address(ctx, ctx->cdb, &sbus_address);
@@ -682,17 +681,21 @@ static int mon_cli_init(struct be_ctx *ctx)
         return ret;
     }
 
-    ret = monitor_init_sbus_methods(ctx, mon_sbus_methods, &sm_ctx);
+    ret = monitor_init_sbus_methods(ctx, mon_sbus_methods, &ctx->mon_sm_ctx);
     if (ret != EOK) {
         DEBUG(0, ("Could not initialize SBUS methods.\n"));
         return ret;
     }
 
-    ret = sbus_client_init(ctx, ctx->ev,
-                           sbus_address, sm_ctx,
-                           ctx /* Private Data */,
-                           NULL /* Destructor */,
-                           &ctx->ss_ctx);
+    /* FIXME: remove this */
+    if (talloc_reference(ctx, ctx->mon_sm_ctx) == NULL) {
+        DEBUG(0, ("Failed to take memory reference\n"));
+        return ENOMEM;
+    }
+
+    ret = sbus_client_init(ctx, ctx->ev, ctx->mon_sm_ctx,
+                           sbus_address, &ctx->mon_conn_ctx,
+                           NULL, ctx);
     if (ret != EOK) {
         DEBUG(0, ("Failed to connect to monitor services.\n"));
         return ret;
@@ -709,7 +712,6 @@ static int be_cli_init(struct be_ctx *ctx)
 {
     int ret, max_retries;
     char *sbus_address;
-    struct sbus_method_ctx *sm_ctx;
 
     /* Set up SBUS connection to the monitor */
     ret = dp_get_sbus_address(ctx, ctx->cdb, &sbus_address);
@@ -718,17 +720,21 @@ static int be_cli_init(struct be_ctx *ctx)
         return ret;
     }
 
-    ret = dp_init_sbus_methods(ctx, be_methods, &sm_ctx);
+    ret = dp_init_sbus_methods(ctx, be_methods, &ctx->dp_sm_ctx);
     if (ret != EOK) {
         DEBUG(0, ("Could not initialize SBUS methods.\n"));
         return ret;
     }
 
-    ret = sbus_client_init(ctx, ctx->ev,
-                           sbus_address, sm_ctx,
-                           ctx /* Private Data */,
-                           NULL /* Destructor */,
-                           &ctx->dp_ctx);
+    /* FIXME: remove this */
+    if (talloc_reference(ctx, ctx->dp_sm_ctx) == NULL) {
+        DEBUG(0, ("Failed to take memory reference\n"));
+        return ENOMEM;
+    }
+
+    ret = sbus_client_init(ctx, ctx->ev, ctx->dp_sm_ctx,
+                           sbus_address, &ctx->dp_conn_ctx,
+                           NULL, ctx);
     if (ret != EOK) {
         DEBUG(0, ("Failed to connect to monitor services.\n"));
         return ret;
@@ -742,7 +748,7 @@ static int be_cli_init(struct be_ctx *ctx)
         return ret;
     }
 
-    sbus_reconnect_init(ctx->dp_ctx->scon_ctx, max_retries,
+    sbus_reconnect_init(ctx->dp_conn_ctx, max_retries,
                         be_cli_reconnect_init, ctx);
 
     return EOK;
@@ -759,8 +765,8 @@ static void be_cli_reconnect_init(struct sbus_conn_ctx *sconn, int status, void
     /* Did we reconnect successfully? */
     if (status == SBUS_RECONNECT_SUCCESS) {
         /* Add the methods back to the new connection */
-        ret = sbus_conn_add_method_ctx(be_ctx->dp_ctx->scon_ctx,
-                                       be_ctx->dp_ctx->sm_ctx);
+        ret = sbus_conn_add_method_ctx(be_ctx->dp_conn_ctx,
+                                       be_ctx->dp_sm_ctx);
         if (ret != EOK) {
             DEBUG(0, ("Could not re-add methods on reconnection.\n"));
             ret = be_finalize(be_ctx);
diff --git a/server/providers/dp_backend.h b/server/providers/dp_backend.h
index 66bc87185..759dd996e 100644
--- a/server/providers/dp_backend.h
+++ b/server/providers/dp_backend.h
@@ -65,13 +65,17 @@ struct be_ctx {
     struct tevent_context *ev;
     struct confdb_ctx *cdb;
     struct sysdb_ctx *sysdb;
-    struct service_sbus_ctx *ss_ctx;
-    struct service_sbus_ctx *dp_ctx;
     struct sss_domain_info *domain;
     const char *name;
     const char *identity;
     const char *conf_path;
 
+    struct sbus_method_ctx *mon_sm_ctx;
+    struct sbus_conn_ctx *mon_conn_ctx;
+
+    struct sbus_method_ctx *dp_sm_ctx;
+    struct sbus_conn_ctx *dp_conn_ctx;
+
     struct loaded_be loaded_be[BET_MAX];
     struct bet_info bet_info[BET_MAX];
 };