From 8e5549e453558d4bebdec333a93e215d5d6ffaec Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Fri, 11 Jan 2013 12:25:53 -0500
Subject: Introduce be_req_terminate() helper

Call it everywhere instead of directly dereferencing be_req->fn
This is in preparation of making be_req opaque.
---
 src/providers/ipa/ipa_subdomains.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'src/providers/ipa/ipa_subdomains.c')

diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c
index 63a82c08..70806bb4 100644
--- a/src/providers/ipa/ipa_subdomains.c
+++ b/src/providers/ipa/ipa_subdomains.c
@@ -107,11 +107,6 @@ const char *get_flat_name_from_subdomain_name(struct be_ctx *be_ctx,
     return NULL;
 }
 
-static void ipa_subdomains_reply(struct be_req *be_req, int dp_err, int result)
-{
-    be_req->fn(be_req, dp_err, result, NULL);
-}
-
 static errno_t ipa_ranges_parse_results(TALLOC_CTX *mem_ctx,
                                         size_t count,
                                         struct sysdb_attrs **reply,
@@ -589,7 +584,7 @@ done:
     if (ret == EOK) {
         dp_error = DP_ERR_OK;
     }
-    ipa_subdomains_reply(be_req, dp_error, ret);
+    be_req_terminate(be_req, dp_error, ret, NULL);
 }
 
 static void ipa_subdomains_get_conn_done(struct tevent_req *req)
@@ -626,7 +621,7 @@ static void ipa_subdomains_get_conn_done(struct tevent_req *req)
     return;
 
 fail:
-    ipa_subdomains_reply(ctx->be_req, dp_error, ret);
+    be_req_terminate(ctx->be_req, dp_error, ret, NULL);
 }
 
 static errno_t
@@ -752,7 +747,7 @@ static void ipa_subdomains_handler_done(struct tevent_req *req)
     ret = EINVAL;
 
 done:
-    ipa_subdomains_reply(ctx->be_req, DP_ERR_FATAL, ret);
+    be_req_terminate(ctx->be_req, DP_ERR_FATAL, ret, NULL);
 }
 
 
@@ -819,7 +814,7 @@ done:
     if (ret == EOK) {
         dp_error = DP_ERR_OK;
     }
-    ipa_subdomains_reply(ctx->be_req, dp_error, ret);
+    be_req_terminate(ctx->be_req, dp_error, ret, NULL);
 }
 
 static void ipa_subdomains_handler_master_done(struct tevent_req *req)
@@ -899,7 +894,7 @@ done:
     if (ret == EOK) {
         dp_error = DP_ERR_OK;
     }
-    ipa_subdomains_reply(ctx->be_req, dp_error, ret);
+    be_req_terminate(ctx->be_req, dp_error, ret, NULL);
 }
 
 static void ipa_subdom_online_cb(void *pvt);
@@ -1004,7 +999,7 @@ void ipa_subdomains_handler(struct be_req *be_req)
     ctx = talloc_get_type(be_req->be_ctx->bet_info[BET_SUBDOMAINS].pvt_bet_data,
                           struct ipa_subdomains_ctx);
     if (!ctx) {
-        ipa_subdomains_reply(be_req, DP_ERR_FATAL, EINVAL);
+        be_req_terminate(be_req, DP_ERR_FATAL, EINVAL, NULL);
         return;
     }
 
@@ -1012,12 +1007,12 @@ void ipa_subdomains_handler(struct be_req *be_req)
 
     if (ctx->disabled_until > now) {
         DEBUG(SSSDBG_TRACE_ALL, ("Subdomain provider disabled.\n"));
-        ipa_subdomains_reply(be_req, DP_ERR_OK, EOK);
+        be_req_terminate(be_req, DP_ERR_OK, EOK, NULL);
         return;
     }
 
     if (ctx->last_refreshed > now - IPA_SUBDOMAIN_REFRESH_LIMIT) {
-        ipa_subdomains_reply(be_req, DP_ERR_OK, EOK);
+        be_req_terminate(be_req, DP_ERR_OK, EOK, NULL);
         return;
     }
 
-- 
cgit