this doesn't need to be public

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index bc1b4b0b6fa76b352e2ad891bb1262a53cf8924a..e46d1f018e1de7a1bcb5f6c34e2a7a1504a17c0f 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -709,6 +709,13 @@ int sql_set_user(rlm_sql_t const *inst, request_t *request, char const *username
  */
 #define sql_unset_user(_i, _r) fr_pair_delete_by_da(&_r->request_pairs, _i->sql_user)
 
+
+typedef struct rlm_sql_grouplist_s rlm_sql_grouplist_t;
+struct rlm_sql_grouplist_s {
+       char                    *name;
+       rlm_sql_grouplist_t     *next;
+};
+
 static int sql_get_grouplist(rlm_sql_t const *inst, rlm_sql_handle_t **handle, request_t *request,
                             rlm_sql_grouplist_t **phead)
 {

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index 34bdfd871a74b45190d2d0fdf4e487a35ce98a04..8078f260bb6acac30280e03855a3cec55e4a4250 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -215,22 +215,16 @@ struct sql_inst {
        module_instance_t       *driver_submodule;      //!< Driver's submodule.
        rlm_sql_driver_t const  *driver;                //!< Driver's exported interface.
 
-       int (*sql_set_user)(rlm_sql_t const *inst, request_t *request, char const *username);
-       xlat_escape_legacy_t sql_escape_func;
-       sql_rcode_t (*query)(rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t **handle, char const *query);
-       sql_rcode_t (*select)(rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t **handle, char const *query);
-       sql_rcode_t (*fetch_row)(rlm_sql_row_t *out, rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t **handle);
+       int                     (*sql_set_user)(rlm_sql_t const *inst, request_t *request, char const *username);
+       xlat_escape_legacy_t    sql_escape_func;
+       sql_rcode_t             (*query)(rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t **handle, char const *query);
+       sql_rcode_t             (*select)(rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t **handle, char const *query);
+       sql_rcode_t             (*fetch_row)(rlm_sql_row_t *out, rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t **handle);
 
        char const              *name;                  //!< Module instance name.
        fr_dict_attr_t const    *group_da;              //!< Group dictionary attribute.
 };
 
-typedef struct rlm_sql_grouplist_s rlm_sql_grouplist_t;
-struct rlm_sql_grouplist_s {
-       char                    *name;
-       rlm_sql_grouplist_t     *next;
-};
-
 void           *sql_mod_conn_create(TALLOC_CTX *ctx, void *instance, fr_time_delta_t timeout);
 int            sql_getvpdata(TALLOC_CTX *ctx, rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t **handle, fr_pair_list_t *out, char const *query);
 void           rlm_sql_query_log(rlm_sql_t const *inst, request_t *request, sql_acct_section_t const *section, char const *query) CC_HINT(nonnull (1, 2, 4));