DP: rename be_acct_req to dp_id_data

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

24 files changed, 118 insertions, 118 deletions

diff --git a/src/providers/ad/ad_id.c b/src/providers/ad/ad_id.c
index 92ac4ab6a..4cc3bac1d 100644
--- a/src/providers/ad/ad_id.c
+++ b/src/providers/ad/ad_id.c
@@ -51,7 +51,7 @@ disable_gc(struct ad_options *ad_options)
 }
 
 struct ad_handle_acct_info_state {
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
     struct sdap_id_ctx *ctx;
     struct sdap_id_conn_ctx **conn;
     struct sdap_domain *sdom;
@@ -68,7 +68,7 @@ static void ad_handle_acct_info_done(struct tevent_req *subreq);
 
 struct tevent_req *
 ad_handle_acct_info_send(TALLOC_CTX *mem_ctx,
-                         struct be_acct_req *ar,
+                         struct dp_id_data *ar,
                          struct sdap_id_ctx *ctx,
                          struct ad_options *ad_options,
                          struct sdap_domain *sdom,
@@ -274,7 +274,7 @@ ad_handle_acct_info_recv(struct tevent_req *req,
 
 struct sdap_id_conn_ctx **
 get_conn_list(TALLOC_CTX *mem_ctx, struct ad_id_ctx *ad_ctx,
-              struct sss_domain_info *dom, struct be_acct_req *ar)
+              struct sss_domain_info *dom, struct dp_id_data *ar)
 {
     struct sdap_id_conn_ctx **clist;
 
@@ -372,7 +372,7 @@ static void ad_account_info_handler_done(struct tevent_req *subreq);
 struct tevent_req *
 ad_account_info_handler_send(TALLOC_CTX *mem_ctx,
                               struct ad_id_ctx *id_ctx,
-                              struct be_acct_req *data,
+                              struct dp_id_data *data,
                               struct dp_req_params *params)
 {
     struct ad_account_info_handler_state *state;
diff --git a/src/providers/ad/ad_id.h b/src/providers/ad/ad_id.h
index 2e7f9005a..145fdc8f2 100644
--- a/src/providers/ad/ad_id.h
+++ b/src/providers/ad/ad_id.h
@@ -26,7 +26,7 @@
 struct tevent_req *
 ad_account_info_handler_send(TALLOC_CTX *mem_ctx,
                               struct ad_id_ctx *id_ctx,
-                              struct be_acct_req *data,
+                              struct dp_id_data *data,
                               struct dp_req_params *params);
 
 errno_t ad_account_info_handler_recv(TALLOC_CTX *mem_ctx,
@@ -35,7 +35,7 @@ errno_t ad_account_info_handler_recv(TALLOC_CTX *mem_ctx,
 
 struct tevent_req *
 ad_handle_acct_info_send(TALLOC_CTX *mem_ctx,
-                         struct be_acct_req *ar,
+                         struct dp_id_data *ar,
                          struct sdap_id_ctx *ctx,
                          struct ad_options *ad_options,
                          struct sdap_domain *sdom,
diff --git a/src/providers/ad/ad_init.c b/src/providers/ad/ad_init.c
index 3a2ec1c7d..131e960d4 100644
--- a/src/providers/ad/ad_init.c
+++ b/src/providers/ad/ad_init.c
@@ -504,7 +504,7 @@ errno_t sssm_ad_id_init(TALLOC_CTX *mem_ctx,
 
     dp_set_method(dp_methods, DPM_ACCOUNT_HANDLER,
                   ad_account_info_handler_send, ad_account_info_handler_recv, id_ctx,
-                  struct ad_id_ctx, struct be_acct_req, struct dp_reply_std);
+                  struct ad_id_ctx, struct dp_id_data, struct dp_reply_std);
 
     dp_set_method(dp_methods, DPM_CHECK_ONLINE,
                   sdap_online_check_handler_send, sdap_online_check_handler_recv, id_ctx->sdap_id_ctx,
diff --git a/src/providers/ad/ad_pac.c b/src/providers/ad/ad_pac.c
index 753c63435..1fd7fd289 100644
--- a/src/providers/ad/ad_pac.c
+++ b/src/providers/ad/ad_pac.c
@@ -28,7 +28,7 @@
 #include "providers/ldap/sdap_async_ad.h"
 
 static errno_t find_user_entry(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom,
-                               struct be_acct_req *ar,
+                               struct dp_id_data *ar,
                                struct ldb_message **_msg)
 {
     const char *user_attrs[] = { SYSDB_NAME, SYSDB_OBJECTCLASS,
@@ -109,7 +109,7 @@ done:
 
 errno_t check_if_pac_is_available(TALLOC_CTX *mem_ctx,
                                   struct sss_domain_info *dom,
-                                  struct be_acct_req *ar,
+                                  struct dp_id_data *ar,
                                   struct ldb_message **_msg)
 {
     struct ldb_message *msg;
@@ -430,7 +430,7 @@ done:
 }
 
 struct ad_handle_pac_initgr_state {
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
     const char *err;
     int dp_error;
     int sdap_ret;
@@ -447,7 +447,7 @@ static void ad_handle_pac_initgr_lookup_sids_done(struct tevent_req *subreq);
 
 struct tevent_req *ad_handle_pac_initgr_send(TALLOC_CTX *mem_ctx,
                                              struct be_ctx *be_ctx,
-                                             struct be_acct_req *ar,
+                                             struct dp_id_data *ar,
                                              struct sdap_id_ctx *id_ctx,
                                              struct sdap_domain *sdom,
                                              struct sdap_id_conn_ctx *conn,
diff --git a/src/providers/ad/ad_pac.h b/src/providers/ad/ad_pac.h
index 421811615..34f1e92c7 100644
--- a/src/providers/ad/ad_pac.h
+++ b/src/providers/ad/ad_pac.h
@@ -42,7 +42,7 @@
 
 errno_t check_if_pac_is_available(TALLOC_CTX *mem_ctx,
                                   struct sss_domain_info *dom,
-                                  struct be_acct_req *ar,
+                                  struct dp_id_data *ar,
                                   struct ldb_message **_msg);
 
 errno_t ad_get_data_from_pac(TALLOC_CTX *mem_ctx,
@@ -68,7 +68,7 @@ errno_t ad_get_pac_data_from_user_entry(TALLOC_CTX *mem_ctx,
 
 struct tevent_req *ad_handle_pac_initgr_send(TALLOC_CTX *mem_ctx,
                                              struct be_ctx *be_ctx,
-                                             struct be_acct_req *ar,
+                                             struct dp_id_data *ar,
                                              struct sdap_id_ctx *id_ctx,
                                              struct sdap_domain *sdom,
                                              struct sdap_id_conn_ctx *conn,
diff --git a/src/providers/data_provider/dp_custom_data.h b/src/providers/data_provider/dp_custom_data.h
index d4cb7e386..21a5890f6 100644
--- a/src/providers/data_provider/dp_custom_data.h
+++ b/src/providers/data_provider/dp_custom_data.h
@@ -43,7 +43,7 @@ struct dp_subdomains_data {
     const char *domain_hint;
 };
 
-struct be_acct_req {
+struct dp_id_data {
     uint32_t entry_type;
     uint32_t attr_type;
     uint32_t filter_type;
diff --git a/src/providers/data_provider/dp_target_id.c b/src/providers/data_provider/dp_target_id.c
index 7c882be2c..f24b2ccb6 100644
--- a/src/providers/data_provider/dp_target_id.c
+++ b/src/providers/data_provider/dp_target_id.c
@@ -43,7 +43,7 @@ static bool check_attr_type(uint32_t attr_type)
     return false;
 }
 
-static bool check_and_parse_filter(struct be_acct_req *data,
+static bool check_and_parse_filter(struct dp_id_data *data,
                                    const char *filter,
                                    const char *extra)
 {
@@ -202,7 +202,7 @@ static errno_t dp_initgroups(struct sbus_request *sbus_req,
                              struct dp_client *dp_cli,
                              const char *key,
                              uint32_t dp_flags,
-                             struct be_acct_req *data)
+                             struct dp_id_data *data)
 {
     struct be_ctx *be_ctx;
     struct sss_domain_info *domain;
@@ -258,7 +258,7 @@ errno_t dp_get_account_info_handler(struct sbus_request *sbus_req,
                                     const char *domain,
                                     const char *extra)
 {
-    struct be_acct_req *data;
+    struct dp_id_data *data;
     const char *key;
     errno_t ret;
 
@@ -266,7 +266,7 @@ errno_t dp_get_account_info_handler(struct sbus_request *sbus_req,
         return EINVAL;
     }
 
-    data = talloc_zero(sbus_req, struct be_acct_req);
+    data = talloc_zero(sbus_req, struct dp_id_data);
     if (data == NULL) {
         return ENOMEM;
     }
diff --git a/src/providers/ipa/ipa_id.c b/src/providers/ipa/ipa_id.c
index e092cd2f8..cfc25b9b3 100644
--- a/src/providers/ipa/ipa_id.c
+++ b/src/providers/ipa/ipa_id.c
@@ -33,11 +33,11 @@
 static struct tevent_req *
 ipa_id_get_account_info_send(TALLOC_CTX *memctx, struct tevent_context *ev,
                              struct ipa_id_ctx *ipa_ctx,
-                             struct be_acct_req *ar);
+                             struct dp_id_data *ar);
 
 static int ipa_id_get_account_info_recv(struct tevent_req *req, int *dp_error);
 
-static bool is_object_overridable(struct be_acct_req *ar)
+static bool is_object_overridable(struct dp_id_data *ar)
 {
     bool ret = false;
 
@@ -114,7 +114,7 @@ static errno_t ipa_resolve_user_list_get_user_step(struct tevent_req *req)
 {
     int ret;
     struct tevent_req *subreq;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
     struct ipa_resolve_user_list_state *state = tevent_req_data(req,
                                             struct ipa_resolve_user_list_state);
 
@@ -122,11 +122,11 @@ static errno_t ipa_resolve_user_list_get_user_step(struct tevent_req *req)
         return EOK;
     }
 
-    ret = get_be_acct_req_for_user_name(state,
+    ret = get_dp_id_data_for_user_name(state,
                             (char *) state->users->values[state->user_idx].data,
                             state->domain_name, &ar);
     if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE, "get_be_acct_req_for_user_name failed.\n");
+        DEBUG(SSSDBG_OP_FAILURE, "get_dp_id_data_for_user_name failed.\n");
         return ret;
     }
 
@@ -206,7 +206,7 @@ struct ipa_initgr_get_overrides_state {
     size_t group_count;
     const char *groups_id_attr;
     size_t group_idx;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
     int dp_error;
 };
@@ -299,17 +299,17 @@ static int ipa_initgr_get_overrides_step(struct tevent_req *req)
     talloc_free(state->ar); /* Avoid spiking memory with many groups */
 
     if (strcmp(state->groups_id_attr, SYSDB_UUID) == 0) {
-        ret = get_be_acct_req_for_uuid(state, ipa_uuid,
+        ret = get_dp_id_data_for_uuid(state, ipa_uuid,
                                        state->user_dom->name, &state->ar);
         if (ret != EOK) {
-            DEBUG(SSSDBG_OP_FAILURE, "get_be_acct_req_for_sid failed.\n");
+            DEBUG(SSSDBG_OP_FAILURE, "get_dp_id_data_for_sid failed.\n");
             return ret;
         }
     } else if (strcmp(state->groups_id_attr, SYSDB_SID_STR) == 0) {
-        ret = get_be_acct_req_for_sid(state, ipa_uuid,
+        ret = get_dp_id_data_for_sid(state, ipa_uuid,
                                       state->user_dom->name, &state->ar);
         if (ret != EOK) {
-            DEBUG(SSSDBG_OP_FAILURE, "get_be_acct_req_for_sid failed.\n");
+            DEBUG(SSSDBG_OP_FAILURE, "get_dp_id_data_for_sid failed.\n");
             return ret;
         }
     } else {
@@ -465,8 +465,8 @@ struct ipa_id_get_account_info_state {
     struct sdap_id_op *op;
     struct sysdb_ctx *sysdb;
     struct sss_domain_info *domain;
-    struct be_acct_req *ar;
-    struct be_acct_req *orig_ar;
+    struct dp_id_data *ar;
+    struct dp_id_data *orig_ar;
     const char *realm;
 
     struct sysdb_attrs *override_attrs;
@@ -483,7 +483,7 @@ struct ipa_id_get_account_info_state {
 static void ipa_id_get_account_info_connected(struct tevent_req *subreq);
 static void ipa_id_get_account_info_got_override(struct tevent_req *subreq);
 static errno_t ipa_id_get_account_info_get_original_step(struct tevent_req *req,
-                                                        struct be_acct_req *ar);
+                                                        struct dp_id_data *ar);
 static void ipa_id_get_account_info_orig_done(struct tevent_req *subreq);
 static void ipa_id_get_account_info_done(struct tevent_req *subreq);
 static void ipa_id_get_user_list_done(struct tevent_req *subreq);
@@ -491,7 +491,7 @@ static void ipa_id_get_user_list_done(struct tevent_req *subreq);
 static struct tevent_req *
 ipa_id_get_account_info_send(TALLOC_CTX *memctx, struct tevent_context *ev,
                              struct ipa_id_ctx *ipa_ctx,
-                             struct be_acct_req *ar)
+                             struct dp_id_data *ar)
 {
     int ret;
     struct tevent_req *req;
@@ -645,11 +645,11 @@ static void ipa_id_get_account_info_got_override(struct tevent_req *subreq)
 
             state->orig_ar = state->ar;
 
-            ret = get_be_acct_req_for_uuid(state, ipa_uuid,
+            ret = get_dp_id_data_for_uuid(state, ipa_uuid,
                                            state->ar->domain,
                                            &state->ar);
             if (ret != EOK) {
-                DEBUG(SSSDBG_OP_FAILURE, "get_be_acct_req_for_uuid failed.\n");
+                DEBUG(SSSDBG_OP_FAILURE, "get_dp_id_data_for_uuid failed.\n");
                 goto fail;
             }
 
@@ -687,7 +687,7 @@ fail:
 }
 
 static errno_t ipa_id_get_account_info_get_original_step(struct tevent_req *req,
-                                                         struct be_acct_req *ar)
+                                                         struct dp_id_data *ar)
 {
     struct ipa_id_get_account_info_state *state = tevent_req_data(req,
                                           struct ipa_id_get_account_info_state);
@@ -784,10 +784,10 @@ static void ipa_id_get_account_info_orig_done(struct tevent_req *subreq)
             goto fail;
         }
 
-        ret = get_be_acct_req_for_uuid(state, uuid, state->domain->name,
+        ret = get_dp_id_data_for_uuid(state, uuid, state->domain->name,
                                        &state->ar);
         if (ret != EOK) {
-            DEBUG(SSSDBG_OP_FAILURE, "get_be_acct_req_for_sid failed.\n");
+            DEBUG(SSSDBG_OP_FAILURE, "get_dp_id_data_for_sid failed.\n");
             goto fail;
         }
 
@@ -1205,7 +1205,7 @@ enum ipa_account_info_type {
 };
 
 static enum ipa_account_info_type
-ipa_decide_account_info_type(struct be_acct_req *data, struct be_ctx *be_ctx)
+ipa_decide_account_info_type(struct dp_id_data *data, struct be_ctx *be_ctx)
 {
     if (strcasecmp(data->domain, be_ctx->domain->name) != 0) {
         return IPA_ACCOUNT_INFO_SUBDOMAIN;
@@ -1226,7 +1226,7 @@ static void ipa_account_info_handler_done(struct tevent_req *subreq);
 struct tevent_req *
 ipa_account_info_handler_send(TALLOC_CTX *mem_ctx,
                               struct ipa_id_ctx *id_ctx,
-                              struct be_acct_req *data,
+                              struct dp_id_data *data,
                               struct dp_req_params *params)
 {
     struct ipa_account_info_handler_state *state;
diff --git a/src/providers/ipa/ipa_id.h b/src/providers/ipa/ipa_id.h
index 17db5226a..410c20868 100644
--- a/src/providers/ipa/ipa_id.h
+++ b/src/providers/ipa/ipa_id.h
@@ -36,7 +36,7 @@
 struct tevent_req *
 ipa_account_info_handler_send(TALLOC_CTX *mem_ctx,
                               struct ipa_id_ctx *id_ctx,
-                              struct be_acct_req *data,
+                              struct dp_id_data *data,
                               struct dp_req_params *params);
 
 errno_t ipa_account_info_handler_recv(TALLOC_CTX *mem_ctx,
@@ -74,21 +74,21 @@ struct tevent_req *ipa_get_subdom_acct_send(TALLOC_CTX *memctx,
                                             struct tevent_context *ev,
                                             struct ipa_id_ctx *ipa_ctx,
                                             struct sysdb_attrs *override_attrs,
-                                            struct be_acct_req *ar);
+                                            struct dp_id_data *ar);
 int ipa_get_subdom_acct_recv(struct tevent_req *req, int *dp_error_out);
 
-errno_t get_be_acct_req_for_sid(TALLOC_CTX *mem_ctx, const char *sid,
+errno_t get_dp_id_data_for_sid(TALLOC_CTX *mem_ctx, const char *sid,
                                 const char *domain_name,
-                                struct be_acct_req **_ar);
+                                struct dp_id_data **_ar);
 
-errno_t get_be_acct_req_for_uuid(TALLOC_CTX *mem_ctx, const char *uuid,
+errno_t get_dp_id_data_for_uuid(TALLOC_CTX *mem_ctx, const char *uuid,
                                  const char *domain_name,
-                                 struct be_acct_req **_ar);
+                                 struct dp_id_data **_ar);
 
-errno_t get_be_acct_req_for_user_name(TALLOC_CTX *mem_ctx,
+errno_t get_dp_id_data_for_user_name(TALLOC_CTX *mem_ctx,
                                       const char *user_name,
                                       const char *domain_name,
-                                      struct be_acct_req **_ar);
+                                      struct dp_id_data **_ar);
 
 struct tevent_req *ipa_get_ad_override_send(TALLOC_CTX *mem_ctx,
                                             struct tevent_context *ev,
@@ -96,7 +96,7 @@ struct tevent_req *ipa_get_ad_override_send(TALLOC_CTX *mem_ctx,
                                             struct ipa_options *ipa_options,
                                             const char *ipa_realm,
                                             const char *view_name,
-                                            struct be_acct_req *ar);
+                                            struct dp_id_data *ar);
 
 errno_t ipa_get_ad_override_recv(struct tevent_req *req, int *dp_error_out,
                                  TALLOC_CTX *mem_ctx,
@@ -105,7 +105,7 @@ errno_t ipa_get_ad_override_recv(struct tevent_req *req, int *dp_error_out,
 struct tevent_req *ipa_subdomain_account_send(TALLOC_CTX *memctx,
                                               struct tevent_context *ev,
                                               struct ipa_id_ctx *ipa_ctx,
-                                              struct be_acct_req *ar);
+                                              struct dp_id_data *ar);
 
 errno_t ipa_subdomain_account_recv(struct tevent_req *req, int *dp_error_out);
 
@@ -114,7 +114,7 @@ errno_t split_ipa_anchor(TALLOC_CTX *mem_ctx, const char *anchor,
 
 errno_t get_object_from_cache(TALLOC_CTX *mem_ctx,
                               struct sss_domain_info *dom,
-                              struct be_acct_req *ar,
+                              struct dp_id_data *ar,
                               struct ldb_message **_msg);
 
 struct tevent_req *
diff --git a/src/providers/ipa/ipa_init.c b/src/providers/ipa/ipa_init.c
index d3093b3b5..6cc34deda 100644
--- a/src/providers/ipa/ipa_init.c
+++ b/src/providers/ipa/ipa_init.c
@@ -714,7 +714,7 @@ errno_t sssm_ipa_id_init(TALLOC_CTX *mem_ctx,
 
     dp_set_method(dp_methods, DPM_ACCOUNT_HANDLER,
                   ipa_account_info_handler_send, ipa_account_info_handler_recv, id_ctx,
-                  struct ipa_id_ctx, struct be_acct_req, struct dp_reply_std);
+                  struct ipa_id_ctx, struct dp_id_data, struct dp_reply_std);
 
     dp_set_method(dp_methods, DPM_CHECK_ONLINE,
                   sdap_online_check_handler_send, sdap_online_check_handler_recv, id_ctx->sdap_id_ctx,
diff --git a/src/providers/ipa/ipa_s2n_exop.c b/src/providers/ipa/ipa_s2n_exop.c
index b28cc415b..84ef83833 100644
--- a/src/providers/ipa/ipa_s2n_exop.c
+++ b/src/providers/ipa/ipa_s2n_exop.c
@@ -1161,7 +1161,7 @@ static void ipa_s2n_get_list_next(struct tevent_req *subreq)
     char *retoid = NULL;
     struct berval *retdata = NULL;
     const char *sid_str;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
     ret = ipa_s2n_exop_recv(subreq, state, &retoid, &retdata);
     talloc_zfree(subreq);
@@ -1197,9 +1197,9 @@ static void ipa_s2n_get_list_next(struct tevent_req *subreq)
         goto fail;
     }
 
-    ret = get_be_acct_req_for_sid(state, sid_str, state->obj_domain->name, &ar);
+    ret = get_dp_id_data_for_sid(state, sid_str, state->obj_domain->name, &ar);
     if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE, "get_be_acct_req_for_sid failed.\n");
+        DEBUG(SSSDBG_OP_FAILURE, "get_dp_id_data_for_sid failed.\n");
         goto fail;
     }
 
@@ -1605,7 +1605,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq)
     char **missing_list = NULL;
     struct ldb_dn **group_dn_list = NULL;
     const char *sid_str;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
     ret = ipa_s2n_exop_recv(subreq, state, &retoid, &retdata);
     talloc_zfree(subreq);
@@ -1772,9 +1772,9 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq)
             goto done;
         }
     } else if (ret == EOK) {
-        ret = get_be_acct_req_for_sid(state, sid_str, state->dom->name, &ar);
+        ret = get_dp_id_data_for_sid(state, sid_str, state->dom->name, &ar);
         if (ret != EOK) {
-            DEBUG(SSSDBG_OP_FAILURE, "get_be_acct_req_for_sid failed.\n");
+            DEBUG(SSSDBG_OP_FAILURE, "get_dp_id_data_for_sid failed.\n");
             goto done;
         }
 
@@ -2370,7 +2370,7 @@ static void ipa_s2n_get_list_done(struct tevent_req  *subreq)
     struct ipa_s2n_get_user_state *state = tevent_req_data(req,
                                                 struct ipa_s2n_get_user_state);
     const char *sid_str;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
     ret = ipa_s2n_get_list_recv(subreq);
     talloc_zfree(subreq);
@@ -2396,9 +2396,9 @@ static void ipa_s2n_get_list_done(struct tevent_req  *subreq)
         goto fail;
     }
 
-    ret = get_be_acct_req_for_sid(state, sid_str, state->dom->name, &ar);
+    ret = get_dp_id_data_for_sid(state, sid_str, state->dom->name, &ar);
     if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE, "get_be_acct_req_for_sid failed.\n");
+        DEBUG(SSSDBG_OP_FAILURE, "get_dp_id_data_for_sid failed.\n");
         goto fail;
     }
 
diff --git a/src/providers/ipa/ipa_subdomains.h b/src/providers/ipa/ipa_subdomains.h
index 8e66ca977..2f3b7b227 100644
--- a/src/providers/ipa/ipa_subdomains.h
+++ b/src/providers/ipa/ipa_subdomains.h
@@ -130,7 +130,7 @@ struct req_input {
 
 struct tevent_req *ipa_get_ad_memberships_send(TALLOC_CTX *mem_ctx,
                                         struct tevent_context *ev,
-                                        struct be_acct_req *ar,
+                                        struct dp_id_data *ar,
                                         struct ipa_server_mode_ctx *server_mode,
                                         struct sss_domain_info *user_dom,
                                         struct sdap_id_ctx *sdap_id_ctx,
diff --git a/src/providers/ipa/ipa_subdomains_ext_groups.c b/src/providers/ipa/ipa_subdomains_ext_groups.c
index ec05a828c..90460bcb6 100644
--- a/src/providers/ipa/ipa_subdomains_ext_groups.c
+++ b/src/providers/ipa/ipa_subdomains_ext_groups.c
@@ -426,7 +426,7 @@ static errno_t ipa_add_ad_memberships_recv(struct tevent_req *req,
 
 struct tevent_req *ipa_get_ad_memberships_send(TALLOC_CTX *mem_ctx,
                                         struct tevent_context *ev,
-                                        struct be_acct_req *ar,
+                                        struct dp_id_data *ar,
                                         struct ipa_server_mode_ctx *server_mode,
                                         struct sss_domain_info *user_dom,
                                         struct sdap_id_ctx *sdap_id_ctx,
@@ -1080,7 +1080,7 @@ struct tevent_req *ipa_ext_group_member_send(TALLOC_CTX *mem_ctx,
     struct ipa_ext_member_state *state;
     struct tevent_req *req;
     struct tevent_req *subreq;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
     errno_t ret;
 
     req = tevent_req_create(mem_ctx, &state, struct ipa_ext_member_state);
@@ -1113,7 +1113,7 @@ struct tevent_req *ipa_ext_group_member_send(TALLOC_CTX *mem_ctx,
         goto immediate;
     }
 
-    ret = get_be_acct_req_for_sid(state, ext_member, state->dom->name, &ar);
+    ret = get_dp_id_data_for_sid(state, ext_member, state->dom->name, &ar);
     if (ret != EOK) {
         DEBUG(SSSDBG_MINOR_FAILURE,
               "Cannot create the account request for [%s]\n", ext_member);
diff --git a/src/providers/ipa/ipa_subdomains_id.c b/src/providers/ipa/ipa_subdomains_id.c
index 65bfd3376..0a89ef5a6 100644
--- a/src/providers/ipa/ipa_subdomains_id.c
+++ b/src/providers/ipa/ipa_subdomains_id.c
@@ -41,7 +41,7 @@ ipa_srv_ad_acct_send(TALLOC_CTX *mem_ctx,
                      struct tevent_context *ev,
                      struct ipa_id_ctx *ipa_ctx,
                      struct sysdb_attrs *override_attrs,
-                     struct be_acct_req *ar);
+                     struct dp_id_data *ar);
 static errno_t
 ipa_srv_ad_acct_recv(struct tevent_req *req, int *dp_error_out);
 
@@ -52,7 +52,7 @@ struct ipa_subdomain_account_state {
     struct sdap_id_op *op;
     struct sysdb_ctx *sysdb;
     struct sss_domain_info *domain;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
     bool ipa_server_mode;
     bool server_retry;
@@ -68,12 +68,12 @@ static void ipa_subdomain_account_connected(struct tevent_req *subreq);
 static void ipa_subdomain_account_got_override(struct tevent_req *subreq);
 static void ipa_subdomain_account_done(struct tevent_req *subreq);
 static errno_t ipa_subdomain_account_get_original_step(struct tevent_req *req,
-                                                       struct be_acct_req *ar);
+                                                       struct dp_id_data *ar);
 
 struct tevent_req *ipa_subdomain_account_send(TALLOC_CTX *memctx,
                                               struct tevent_context *ev,
                                               struct ipa_id_ctx *ipa_ctx,
-                                              struct be_acct_req *ar)
+                                              struct dp_id_data *ar)
 {
     struct tevent_req *req;
     struct ipa_subdomain_account_state *state;
@@ -199,7 +199,7 @@ static void ipa_subdomain_account_got_override(struct tevent_req *subreq)
     int dp_error = DP_ERR_FATAL;
     int ret;
     const char *anchor = NULL;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
     ret = ipa_get_ad_override_recv(subreq, &dp_error, state,
                                    &state->override_attrs);
@@ -221,12 +221,12 @@ static void ipa_subdomain_account_got_override(struct tevent_req *subreq)
         if (anchor != NULL && strncmp(OVERRIDE_ANCHOR_SID_PREFIX, anchor,
                                       OVERRIDE_ANCHOR_SID_PREFIX_LEN) == 0) {
 
-            ret = get_be_acct_req_for_sid(state,
+            ret = get_dp_id_data_for_sid(state,
                                         anchor + OVERRIDE_ANCHOR_SID_PREFIX_LEN,
                                         state->ar->domain,
                                         &ar);
             if (ret != EOK) {
-                DEBUG(SSSDBG_OP_FAILURE, "get_be_acct_req_for_sid failed.\n");
+                DEBUG(SSSDBG_OP_FAILURE, "get_dp_id_data_for_sid failed.\n");
                 goto fail;
             }
 
@@ -265,7 +265,7 @@ fail:
 }
 
 static errno_t ipa_subdomain_account_get_original_step(struct tevent_req *req,
-                                                       struct be_acct_req *ar)
+                                                       struct dp_id_data *ar)
 {
     struct ipa_subdomain_account_state *state = tevent_req_data(req,
                                             struct ipa_subdomain_account_state);
@@ -357,7 +357,7 @@ struct tevent_req *ipa_get_subdom_acct_send(TALLOC_CTX *memctx,
                                             struct tevent_context *ev,
                                             struct ipa_id_ctx *ipa_ctx,
                                             struct sysdb_attrs *override_attrs,
-                                            struct be_acct_req *ar)
+                                            struct dp_id_data *ar)
 {
     struct tevent_req *req;
     struct ipa_get_subdom_acct *state;
@@ -624,7 +624,7 @@ struct ipa_get_ad_acct_state {
     int dp_error;
     struct tevent_context *ev;
     struct ipa_id_ctx *ipa_ctx;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
     struct sss_domain_info *obj_dom;
     char *object_sid;
     struct sysdb_attrs *override_attrs;
@@ -645,7 +645,7 @@ ipa_get_ad_acct_send(TALLOC_CTX *mem_ctx,
                      struct tevent_context *ev,
                      struct ipa_id_ctx *ipa_ctx,
                      struct sysdb_attrs *override_attrs,
-                     struct be_acct_req *ar)
+                     struct dp_id_data *ar)
 {
     errno_t ret;
     struct tevent_req *req;
@@ -939,7 +939,7 @@ done:
 
 errno_t get_object_from_cache(TALLOC_CTX *mem_ctx,
                               struct sss_domain_info *dom,
-                              struct be_acct_req *ar,
+                              struct dp_id_data *ar,
                               struct ldb_message **_msg)
 {
     errno_t ret;
@@ -1083,7 +1083,7 @@ ipa_get_ad_acct_ad_part_done(struct tevent_req *subreq)
                                                 struct ipa_get_ad_acct_state);
     errno_t ret;
     const char *sid;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
     ret = ad_handle_acct_info_recv(subreq, &state->dp_error, NULL);
     talloc_zfree(subreq);
@@ -1131,10 +1131,10 @@ ipa_get_ad_acct_ad_part_done(struct tevent_req *subreq)
             goto fail;
         }
 
-        ret = get_be_acct_req_for_sid(state, state->object_sid,
+        ret = get_dp_id_data_for_sid(state, state->object_sid,
                                       state->obj_dom->name, &ar);
         if (ret != EOK) {
-            DEBUG(SSSDBG_OP_FAILURE, "get_be_acct_req_for_sid failed.\n");
+            DEBUG(SSSDBG_OP_FAILURE, "get_dp_id_data_for_sid failed.\n");
             goto fail;
         }
 
@@ -1392,7 +1392,7 @@ struct ipa_srv_ad_acct_state {
     struct tevent_context *ev;
     struct ipa_id_ctx *ipa_ctx;
     struct sysdb_attrs *override_attrs;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
     struct sss_domain_info *obj_dom;
     struct be_ctx *be_ctx;
@@ -1410,7 +1410,7 @@ ipa_srv_ad_acct_send(TALLOC_CTX *mem_ctx,
                      struct tevent_context *ev,
                      struct ipa_id_ctx *ipa_ctx,
                      struct sysdb_attrs *override_attrs,
-                     struct be_acct_req *ar)
+                     struct dp_id_data *ar)
 {
     errno_t ret;
     struct tevent_req *req;
diff --git a/src/providers/ipa/ipa_views.c b/src/providers/ipa/ipa_views.c
index 6aeb443c9..29f589ec1 100644
--- a/src/providers/ipa/ipa_views.c
+++ b/src/providers/ipa/ipa_views.c
@@ -28,9 +28,9 @@
 #include "providers/ldap/sdap_async.h"
 #include "providers/ipa/ipa_id.h"
 
-static errno_t be_acct_req_to_override_filter(TALLOC_CTX *mem_ctx,
+static errno_t dp_id_data_to_override_filter(TALLOC_CTX *mem_ctx,
                                               struct ipa_options *ipa_opts,
-                                              struct be_acct_req *ar,
+                                              struct dp_id_data *ar,
                                               char **override_filter)
 {
     char *filter;
@@ -189,14 +189,14 @@ static errno_t be_acct_req_to_override_filter(TALLOC_CTX *mem_ctx,
     return EOK;
 }
 
-static errno_t get_be_acct_req_for_xyz(TALLOC_CTX *mem_ctx, const char *val,
+static errno_t get_dp_id_data_for_xyz(TALLOC_CTX *mem_ctx, const char *val,
                                        const char *domain_name,
                                        int type,
-                                       struct be_acct_req **_ar)
+                                       struct dp_id_data **_ar)
 {
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
-    ar = talloc_zero(mem_ctx, struct be_acct_req);
+    ar = talloc_zero(mem_ctx, struct dp_id_data);
     if (ar == NULL) {
         DEBUG(SSSDBG_OP_FAILURE, "talloc_zero failed.\n");
         return ENOMEM;
@@ -235,28 +235,28 @@ static errno_t get_be_acct_req_for_xyz(TALLOC_CTX *mem_ctx, const char *val,
     return EOK;
 }
 
-errno_t get_be_acct_req_for_sid(TALLOC_CTX *mem_ctx, const char *sid,
+errno_t get_dp_id_data_for_sid(TALLOC_CTX *mem_ctx, const char *sid,
                                 const char *domain_name,
-                                struct be_acct_req **_ar)
+                                struct dp_id_data **_ar)
 {
-    return get_be_acct_req_for_xyz(mem_ctx, sid, domain_name, BE_REQ_BY_SECID,
+    return get_dp_id_data_for_xyz(mem_ctx, sid, domain_name, BE_REQ_BY_SECID,
                                    _ar);
 }
 
-errno_t get_be_acct_req_for_uuid(TALLOC_CTX *mem_ctx, const char *uuid,
+errno_t get_dp_id_data_for_uuid(TALLOC_CTX *mem_ctx, const char *uuid,
                                  const char *domain_name,
-                                 struct be_acct_req **_ar)
+                                 struct dp_id_data **_ar)
 {
-    return get_be_acct_req_for_xyz(mem_ctx, uuid, domain_name, BE_REQ_BY_UUID,
+    return get_dp_id_data_for_xyz(mem_ctx, uuid, domain_name, BE_REQ_BY_UUID,
                                    _ar);
 }
 
-errno_t get_be_acct_req_for_user_name(TALLOC_CTX *mem_ctx,
+errno_t get_dp_id_data_for_user_name(TALLOC_CTX *mem_ctx,
                                       const char *user_name,
                                       const char *domain_name,
-                                      struct be_acct_req **_ar)
+                                      struct dp_id_data **_ar)
 {
-    return get_be_acct_req_for_xyz(mem_ctx, user_name, domain_name, BE_REQ_USER,
+    return get_dp_id_data_for_xyz(mem_ctx, user_name, domain_name, BE_REQ_USER,
                                    _ar);
 }
 
@@ -266,7 +266,7 @@ struct ipa_get_ad_override_state {
     struct ipa_options *ipa_options;
     const char *ipa_realm;
     const char *ipa_view_name;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
     struct sdap_id_op *sdap_op;
     int dp_error;
@@ -285,7 +285,7 @@ struct tevent_req *ipa_get_ad_override_send(TALLOC_CTX *mem_ctx,
                                             struct ipa_options *ipa_options,
                                             const char *ipa_realm,
                                             const char *view_name,
-                                            struct be_acct_req *ar)
+                                            struct dp_id_data *ar)
 {
     int ret;
     struct tevent_req *req;
@@ -391,10 +391,10 @@ static void ipa_get_ad_override_connect_done(struct tevent_req *subreq)
         goto fail;
     }
 
-    ret = be_acct_req_to_override_filter(state, state->ipa_options, state->ar,
+    ret = dp_id_data_to_override_filter(state, state->ipa_options, state->ar,
                                          &state->filter);
     if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE, "be_acct_req_to_override_filter failed.\n");
+        DEBUG(SSSDBG_OP_FAILURE, "dp_id_data_to_override_filter failed.\n");
         goto fail;
     }
 
diff --git a/src/providers/ldap/ldap_common.h b/src/providers/ldap/ldap_common.h
index b39f67892..713b1dadf 100644
--- a/src/providers/ldap/ldap_common.h
+++ b/src/providers/ldap/ldap_common.h
@@ -98,7 +98,7 @@ errno_t sdap_reinit_cleanup_recv(struct tevent_req *req);
 struct tevent_req *
 sdap_account_info_handler_send(TALLOC_CTX *mem_ctx,
                                struct sdap_id_ctx *id_ctx,
-                               struct be_acct_req *data,
+                               struct dp_id_data *data,
                                struct dp_req_params *params);
 
 errno_t sdap_account_info_handler_recv(TALLOC_CTX *mem_ctx,
@@ -115,12 +115,12 @@ int sdap_id_setup_tasks(struct be_ctx *be_ctx,
                         void *pvt);
 
 /* Allow shortcutting an enumeration request */
-bool sdap_is_enum_request(struct be_acct_req *ar);
+bool sdap_is_enum_request(struct dp_id_data *ar);
 
 struct tevent_req *
 sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
                           struct be_ctx *be_ctx,
-                          struct be_acct_req *ar,
+                          struct dp_id_data *ar,
                           struct sdap_id_ctx *id_ctx,
                           struct sdap_domain *sdom,
                           struct sdap_id_conn_ctx *conn,
diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c
index 0106a7b96..2fccc7e6c 100644
--- a/src/providers/ldap/ldap_id.c
+++ b/src/providers/ldap/ldap_id.c
@@ -1346,7 +1346,7 @@ static struct tevent_req *get_user_and_group_send(TALLOC_CTX *memctx,
 errno_t sdap_get_user_and_group_recv(struct tevent_req *req,
                                      int *dp_error_out, int *sdap_ret);
 
-bool sdap_is_enum_request(struct be_acct_req *ar)
+bool sdap_is_enum_request(struct dp_id_data *ar)
 {
     switch (ar->entry_type & BE_REQ_TYPE_MASK) {
     case BE_REQ_USER:
@@ -1362,7 +1362,7 @@ bool sdap_is_enum_request(struct be_acct_req *ar)
 
 /* A generic LDAP account info handler */
 struct sdap_handle_acct_req_state {
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
     const char *err;
     int dp_error;
     int sdap_ret;
@@ -1373,7 +1373,7 @@ static void sdap_handle_acct_req_done(struct tevent_req *subreq);
 struct tevent_req *
 sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
                           struct be_ctx *be_ctx,
-                          struct be_acct_req *ar,
+                          struct dp_id_data *ar,
                           struct sdap_id_ctx *id_ctx,
                           struct sdap_domain *sdom,
                           struct sdap_id_conn_ctx *conn,
@@ -1849,7 +1849,7 @@ static void sdap_account_info_handler_done(struct tevent_req *subreq);
 struct tevent_req *
 sdap_account_info_handler_send(TALLOC_CTX *mem_ctx,
                                struct sdap_id_ctx *id_ctx,
-                               struct be_acct_req *data,
+                               struct dp_id_data *data,
                                struct dp_req_params *params)
 {
     struct sdap_account_info_handler_state *state;
diff --git a/src/providers/ldap/ldap_init.c b/src/providers/ldap/ldap_init.c
index 566924cbc..b7102adb8 100644
--- a/src/providers/ldap/ldap_init.c
+++ b/src/providers/ldap/ldap_init.c
@@ -523,7 +523,7 @@ errno_t sssm_ldap_id_init(TALLOC_CTX *mem_ctx,
 
     dp_set_method(dp_methods, DPM_ACCOUNT_HANDLER,
                   sdap_account_info_handler_send, sdap_account_info_handler_recv, id_ctx,
-                  struct sdap_id_ctx, struct be_acct_req, struct dp_reply_std);
+                  struct sdap_id_ctx, struct dp_id_data, struct dp_reply_std);
 
     dp_set_method(dp_methods, DPM_CHECK_ONLINE,
                   sdap_online_check_handler_send, sdap_online_check_handler_recv, id_ctx,
diff --git a/src/providers/ldap/sdap_refresh.c b/src/providers/ldap/sdap_refresh.c
index bda50aeb3..59619b158 100644
--- a/src/providers/ldap/sdap_refresh.c
+++ b/src/providers/ldap/sdap_refresh.c
@@ -27,7 +27,7 @@
 struct sdap_refresh_state {
     struct tevent_context *ev;
     struct be_ctx *be_ctx;
-    struct be_acct_req *account_req;
+    struct dp_id_data *account_req;
     struct sdap_id_ctx *id_ctx;
     struct sdap_domain *sdom;
     const char *type;
@@ -88,7 +88,7 @@ static struct tevent_req *sdap_refresh_send(TALLOC_CTX *mem_ctx,
         DEBUG(SSSDBG_CRIT_FAILURE, "Invalid entry type [%d]!\n", entry_type);
     }
 
-    state->account_req = talloc_zero(state, struct be_acct_req);
+    state->account_req = talloc_zero(state, struct dp_id_data);
     if (state->account_req == NULL) {
         ret = ENOMEM;
         goto immediately;
diff --git a/src/providers/proxy/proxy.h b/src/providers/proxy/proxy.h
index 11c85c54e..3aa090dc8 100644
--- a/src/providers/proxy/proxy.h
+++ b/src/providers/proxy/proxy.h
@@ -147,7 +147,7 @@ struct pc_init_ctx {
 struct tevent_req *
 proxy_account_info_handler_send(TALLOC_CTX *mem_ctx,
                                struct proxy_id_ctx *id_ctx,
-                               struct be_acct_req *data,
+                               struct dp_id_data *data,
                                struct dp_req_params *params);
 
 errno_t proxy_account_info_handler_recv(TALLOC_CTX *mem_ctx,
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c
index f633a5e1c..26f4d7499 100644
--- a/src/providers/proxy/proxy_id.c
+++ b/src/providers/proxy/proxy_id.c
@@ -1453,7 +1453,7 @@ static int get_initgr_groups_process(TALLOC_CTX *memctx,
 static struct dp_reply_std
 proxy_account_info(TALLOC_CTX *mem_ctx,
                    struct proxy_id_ctx *ctx,
-                   struct be_acct_req *data,
+                   struct dp_id_data *data,
                    struct be_ctx *be_ctx,
                    struct sss_domain_info *domain)
 {
@@ -1627,7 +1627,7 @@ struct proxy_account_info_handler_state {
 struct tevent_req *
 proxy_account_info_handler_send(TALLOC_CTX *mem_ctx,
                                struct proxy_id_ctx *id_ctx,
-                               struct be_acct_req *data,
+                               struct dp_id_data *data,
                                struct dp_req_params *params)
 {
     struct proxy_account_info_handler_state *state;
diff --git a/src/providers/proxy/proxy_init.c b/src/providers/proxy/proxy_init.c
index 3a4cee91e..1edf4fd64 100644
--- a/src/providers/proxy/proxy_init.c
+++ b/src/providers/proxy/proxy_init.c
@@ -331,7 +331,7 @@ errno_t sssm_proxy_id_init(TALLOC_CTX *mem_ctx,
 
     dp_set_method(dp_methods, DPM_ACCOUNT_HANDLER,
                   proxy_account_info_handler_send, proxy_account_info_handler_recv, ctx,
-                  struct proxy_id_ctx, struct be_acct_req, struct dp_reply_std);
+                  struct proxy_id_ctx, struct dp_id_data, struct dp_reply_std);
 
     ret = EOK;
 
diff --git a/src/providers/simple/simple_access_check.c b/src/providers/simple/simple_access_check.c
index 094ed364a..227a9c620 100644
--- a/src/providers/simple/simple_access_check.c
+++ b/src/providers/simple/simple_access_check.c
@@ -227,7 +227,7 @@ simple_resolve_group_send(TALLOC_CTX *mem_ctx,
     struct tevent_req *req;
     struct tevent_req *subreq;
     struct simple_resolve_group_state *state;
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
 
     req = tevent_req_create(mem_ctx, &state,
                             struct simple_resolve_group_state);
@@ -252,7 +252,7 @@ simple_resolve_group_send(TALLOC_CTX *mem_ctx,
     }
     /* EAGAIN - still needs update */
 
-    ar = talloc(state, struct be_acct_req);
+    ar = talloc(state, struct dp_id_data);
     if (!ar) {
         ret = ENOMEM;
         goto done;
diff --git a/src/tests/cmocka/test_ad_common.c b/src/tests/cmocka/test_ad_common.c
index b7a5838de..40682dc1e 100644
--- a/src/tests/cmocka/test_ad_common.c
+++ b/src/tests/cmocka/test_ad_common.c
@@ -115,14 +115,14 @@ static void test_check_if_pac_is_available(void **state)
     int ret;
     struct ad_sysdb_test_ctx *test_ctx =
         talloc_get_type(*state, struct ad_sysdb_test_ctx);
-    struct be_acct_req *ar;
+    struct dp_id_data *ar;
     struct ldb_message *msg = NULL;
     struct sysdb_attrs *attrs;
 
     ret = check_if_pac_is_available(NULL, NULL, NULL, NULL);
     assert_int_equal(ret, EINVAL);
 
-    ar = talloc_zero(test_ctx, struct be_acct_req);
+    ar = talloc_zero(test_ctx, struct dp_id_data);
     assert_non_null(ar);
 
     ret = check_if_pac_is_available(test_ctx, test_ctx->tctx->dom, ar, &msg);