Fix struct names

diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c
index 957a84e785966697e129bbf78c5fa3c6102c9b3c..6f7f593885736337a88c497ade7998c9da10fc47 100644 (file)
--- a/src/modules/rlm_ldap/groups.c
+++ b/src/modules/rlm_ldap/groups.c
@@ -71,7 +71,7 @@ typedef struct {
  *
  */
 typedef struct {
-       ldap_memberof_xlat_ctx_t        *xlat_ctx;              //!< Xlat context being evaluated.
+       ldap_group_xlat_ctx_t   *xlat_ctx;              //!< Xlat context being evaluated.
        char const                      *attrs[2];              //!< For retrieving the group name.
        struct berval                   **values;               //!< Values of the membership attribute to check.
        int                             count;                  //!< How many entries there are in values.
@@ -742,7 +742,7 @@ static unlang_action_t ldap_check_groupobj_resume(rlm_rcode_t *p_result, UNUSED
                                                      void *uctx)
 {
        ldap_group_groupobj_ctx_t       *group_ctx = talloc_get_type_abort(uctx, ldap_group_groupobj_ctx_t);
-       ldap_memberof_xlat_ctx_t        *xlat_ctx = talloc_get_type_abort(group_ctx->uctx, ldap_memberof_xlat_ctx_t);
+       ldap_group_xlat_ctx_t   *xlat_ctx = talloc_get_type_abort(group_ctx->uctx, ldap_group_xlat_ctx_t);
        fr_ldap_query_t                 *query = group_ctx->query;
        rlm_rcode_t                     rcode = RLM_MODULE_OK;
 
@@ -784,7 +784,7 @@ static unlang_action_t ldap_check_groupobj_resume(rlm_rcode_t *p_result, UNUSED
  * @param xlat_ctx     xlat context being processed.
  */
 unlang_action_t rlm_ldap_check_groupobj_dynamic(rlm_rcode_t *p_result, request_t *request,
-                                               ldap_memberof_xlat_ctx_t *xlat_ctx)
+                                               ldap_group_xlat_ctx_t *xlat_ctx)
 {
        rlm_ldap_t const                *inst = xlat_ctx->inst;
        ldap_group_groupobj_ctx_t       *group_ctx;
@@ -858,7 +858,7 @@ unlang_action_t rlm_ldap_check_groupobj_dynamic(rlm_rcode_t *p_result, request_t
 static unlang_action_t ldap_dn2name_start (rlm_rcode_t *p_result, UNUSED int *priority, request_t *request, void *uctx)
 {
        ldap_group_userobj_dyn_ctx_t    *group_ctx = talloc_get_type_abort(uctx, ldap_group_userobj_dyn_ctx_t);
-       ldap_memberof_xlat_ctx_t        *xlat_ctx = group_ctx->xlat_ctx;
+       ldap_group_xlat_ctx_t   *xlat_ctx = group_ctx->xlat_ctx;
        rlm_ldap_t const                *inst = xlat_ctx->inst;
 
        if (!inst->group.obj_name_attr) {
@@ -894,7 +894,7 @@ static unlang_action_t ldap_check_userobj_start(UNUSED rlm_rcode_t *p_result, UN
                                                request_t *request, void *uctx)
 {
        ldap_group_userobj_dyn_ctx_t    *group_ctx = talloc_get_type_abort(uctx, ldap_group_userobj_dyn_ctx_t);
-       ldap_memberof_xlat_ctx_t        *xlat_ctx = talloc_get_type_abort(group_ctx->xlat_ctx, ldap_memberof_xlat_ctx_t);
+       ldap_group_xlat_ctx_t   *xlat_ctx = talloc_get_type_abort(group_ctx->xlat_ctx, ldap_group_xlat_ctx_t);
 
        return fr_ldap_trunk_search(xlat_ctx, &xlat_ctx->query, request, xlat_ctx->ttrunk, xlat_ctx->dn,
                                    LDAP_SCOPE_BASE, NULL, xlat_ctx->attrs, NULL, NULL);
@@ -907,7 +907,7 @@ static unlang_action_t ldap_check_userobj_resume(rlm_rcode_t *p_result, UNUSED i
                                                 request_t *request, void *uctx)
 {
        ldap_group_userobj_dyn_ctx_t    *group_ctx = talloc_get_type_abort(uctx, ldap_group_userobj_dyn_ctx_t);
-       ldap_memberof_xlat_ctx_t        *xlat_ctx = talloc_get_type_abort(group_ctx->xlat_ctx, ldap_memberof_xlat_ctx_t);
+       ldap_group_xlat_ctx_t   *xlat_ctx = talloc_get_type_abort(group_ctx->xlat_ctx, ldap_group_xlat_ctx_t);
        rlm_ldap_t const                *inst = xlat_ctx->inst;
        fr_ldap_query_t                 *query = xlat_ctx->query;
        LDAPMessage                     *entry;
@@ -1115,7 +1115,7 @@ static int userobj_dyn_free(ldap_group_userobj_dyn_ctx_t *group_ctx)
  * @param[in] xlat_ctx         Context of the xlat being evaluated.
  */
 unlang_action_t rlm_ldap_check_userobj_dynamic(rlm_rcode_t *p_result, request_t *request,
-                                              ldap_memberof_xlat_ctx_t *xlat_ctx)
+                                              ldap_group_xlat_ctx_t *xlat_ctx)
 {
        rlm_ldap_t const                *inst = xlat_ctx->inst;
        ldap_group_userobj_dyn_ctx_t    *group_ctx;

diff --git a/src/modules/rlm_ldap/rlm_ldap.h b/src/modules/rlm_ldap/rlm_ldap.h
index 9616ce8a17dcf64a0478bd33824a2510041e6b2d..550b3edf7b2e043a1c07c209c78729f015d3af1a 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.h
+++ b/src/modules/rlm_ldap/rlm_ldap.h
@@ -230,7 +230,7 @@ typedef struct {
        fr_ldap_query_t                 *query;
        ldap_group_xlat_status_t        status;
        bool                            found;
-} ldap_memberof_xlat_ctx_t;
+} ldap_group_xlat_ctx_t;
 
 extern HIDDEN fr_dict_attr_t const *attr_password;
 extern HIDDEN fr_dict_attr_t const *attr_cleartext_password;
@@ -274,10 +274,10 @@ unlang_action_t rlm_ldap_cacheable_userobj(rlm_rcode_t *p_result, request_t *req
 unlang_action_t rlm_ldap_cacheable_groupobj(rlm_rcode_t *p_result, request_t *request, ldap_autz_ctx_t *autz_ctx);
 
 unlang_action_t rlm_ldap_check_groupobj_dynamic(rlm_rcode_t *p_result, request_t *request,
-                                               ldap_memberof_xlat_ctx_t *xlat_ctx);
+                                               ldap_group_xlat_ctx_t *xlat_ctx);
 
 unlang_action_t rlm_ldap_check_userobj_dynamic(rlm_rcode_t *p_result, request_t *request,
-                                              ldap_memberof_xlat_ctx_t *xlat_ctx);
+                                              ldap_group_xlat_ctx_t *xlat_ctx);
 
 unlang_action_t rlm_ldap_check_cached(rlm_rcode_t *p_result,
                                      rlm_ldap_t const *inst, request_t *request, fr_value_box_t const *check);