sql_set_user is only used in rlm_sql.c

And the username option is always NULL - so remove it

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index ad7a8823f47f7ecb22ad509d2b90d69921648688..cd047e328929c5f4fdf377a00bc3e4d4f2b33a9c 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -704,7 +704,7 @@ static size_t sql_escape_func(UNUSED request_t *request, char *out, size_t outle
  *     escape it twice. (it will make things wrong if we have an
  *     escape candidate character in the username)
  */
-int sql_set_user(rlm_sql_t const *inst, request_t *request, char const *username)
+static int sql_set_user(rlm_sql_t const *inst, request_t *request)
 {
        char *expanded = NULL;
        fr_pair_t *vp = NULL;
@@ -713,9 +713,7 @@ int sql_set_user(rlm_sql_t const *inst, request_t *request, char const *username
 
        fr_assert(request->packet != NULL);
 
-       if (username != NULL) {
-               sqluser = username;
-       } else if (inst->config.query_user[0] != '\0') {
+       if (inst->config.query_user[0] != '\0') {
                sqluser = inst->config.query_user;
        } else {
                return 0;
@@ -807,11 +805,9 @@ static bool CC_HINT(nonnull) sql_check_group(rlm_sql_t const *inst, request_t *r
        rlm_sql_grouplist_t     *entry, *head = NULL;
 
        /*
-        *      Set, escape, and check the user attr here
+        *      Set the user attr here
         */
-       if (sql_set_user(inst, request, NULL) < 0) {
-               return false;
-       }
+       if (sql_set_user(inst, request) < 0) return false;
 
        /*
         *      Get a socket for this lookup
@@ -1124,7 +1120,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
        /*
         *      Set, escape, and check the user attr here
         */
-       if (sql_set_user(inst, request, NULL) < 0) RETURN_MODULE_FAIL;
+       if (sql_set_user(inst, request) < 0) RETURN_MODULE_FAIL;
 
        /*
         *      Reserve a socket
@@ -1375,7 +1371,7 @@ static unlang_action_t acct_redundant(rlm_rcode_t *p_result, rlm_sql_t const *in
                goto finish;
        }
 
-       sql_set_user(inst, request, NULL);
+       sql_set_user(inst, request);
 
        while (true) {
                value = cf_pair_value(pair);
@@ -1673,7 +1669,6 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        /*
         *      Export these methods, too.  This avoids RTDL_GLOBAL.
         */
-       inst->sql_set_user              = sql_set_user;
        inst->query                     = rlm_sql_query;
        inst->select                    = rlm_sql_select_query;
        inst->fetch_row                 = rlm_sql_fetch_row;

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index d0a0c72520844f98a9ff405890c13df01b1a6fe5..65626a92005011c109e6058e4334686396922f85 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -222,7 +222,6 @@ 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_box_escape_t        box_escape_func;
        sql_rcode_t             (*query)(rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t **handle, char const *query);
@@ -240,7 +239,6 @@ sql_rcode_t rlm_sql_select_query(rlm_sql_t const *inst, request_t *request, rlm_
 sql_rcode_t    rlm_sql_query(rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t **handle, char const *query) CC_HINT(nonnull (1, 3, 4));
 sql_rcode_t            rlm_sql_fetch_row(rlm_sql_row_t *out, rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t **handle);
 void           rlm_sql_print_error(rlm_sql_t const *inst, request_t *request, rlm_sql_handle_t *handle, bool force_debug);
-int            sql_set_user(rlm_sql_t const *inst, request_t *request, char const *username);
 
 /*
  *     sql_state.c