make check items "const" for comparison

so that we catch issues like commit 653ed7b when compiling, and
not when the server crashes in production.

diff --git a/src/lib/server/paircmp.c b/src/lib/server/paircmp.c
index 04b5faa91dc56a7cc5e34f0facdd278a572a51ca..83cd7e726c1151f4cfb6b49cce7dd7c576da9a23 100644 (file)
--- a/src/lib/server/paircmp.c
+++ b/src/lib/server/paircmp.c
@@ -106,7 +106,7 @@ static paircmp_t *cmp;
 static int packet_cmp(UNUSED void *instance,
                      request_t *request,
                      UNUSED fr_pair_list_t *request_list,
-                     fr_pair_t *check_item)
+                     fr_pair_t const *check_item)
 {
        VP_VERIFY(check_item);
 
@@ -121,7 +121,7 @@ static int packet_cmp(UNUSED void *instance,
 static int generic_cmp(UNUSED void *instance,
                       request_t *request,
                       UNUSED fr_pair_list_t *request_list,
-                      fr_pair_t *check_item)
+                      fr_pair_t const *check_item)
 {
        VP_VERIFY(check_item);
 
@@ -474,7 +474,7 @@ static int paircmp_func(request_t *request,
  */
 int paircmp_virtual(request_t *request,
                    fr_pair_list_t *request_list,
-                   fr_pair_t *check_item)
+                   fr_pair_t const *check_item)
 {
        paircmp_t *c;
 

diff --git a/src/lib/server/paircmp.h b/src/lib/server/paircmp.h
index ec684090badb04c2a0098e20e00e4a735ed5158c..6b78d84d904d408e4972486a7bc6ee8b827cb11a 100644 (file)
--- a/src/lib/server/paircmp.h
+++ b/src/lib/server/paircmp.h
@@ -35,7 +35,7 @@ extern "C" {
 #include <freeradius-devel/util/pair.h>
 
 /* for paircmp_register */
-typedef int (*RAD_COMPARE_FUNC)(void *instance, request_t *,fr_pair_list_t *, fr_pair_t *);
+typedef int (*RAD_COMPARE_FUNC)(void *instance, request_t *,fr_pair_list_t *, fr_pair_t const *);
 
 int            paircmp_pairs(request_t *request, fr_pair_t const *check, fr_pair_t *vp);
 
@@ -43,7 +43,7 @@ int           paircmp(request_t *request, fr_pair_list_t *request_list, fr_pair_list_t *c
 
 int            paircmp_virtual(request_t *request,
                                fr_pair_list_t *request_list,
-                               fr_pair_t *check_item);
+                               fr_pair_t const *check_item);
 
 int            paircmp_find(fr_dict_attr_t const *da);
 

diff --git a/src/modules/rlm_expiration/rlm_expiration.c b/src/modules/rlm_expiration/rlm_expiration.c
index c7abdfc372a47fb0fb568c7d2c1c43cc76a800f9..e735db8012f729e071ce926680c9252af8a93157 100644 (file)
--- a/src/modules/rlm_expiration/rlm_expiration.c
+++ b/src/modules/rlm_expiration/rlm_expiration.c
@@ -110,7 +110,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, UNU
 /*
  *      Compare the expiration date.
  */
-static int expirecmp(UNUSED void *instance, request_t *req, UNUSED fr_pair_list_t *request_list, fr_pair_t *check)
+static int expirecmp(UNUSED void *instance, request_t *req, UNUSED fr_pair_list_t *request_list, fr_pair_t const *check)
 {
        time_t now = 0;
 

diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c
index 8669363cb9025b6b3c57b63a0f0325588dc10542..f9c4cb0261c97918db5da00b7e17f7cb398de310 100644 (file)
--- a/src/modules/rlm_ldap/groups.c
+++ b/src/modules/rlm_ldap/groups.c
@@ -543,7 +543,7 @@ finish:
  * @param[in] check            vp containing the group value (name or dn).
  */
 unlang_action_t rlm_ldap_check_groupobj_dynamic(rlm_rcode_t *p_result, rlm_ldap_t const *inst, request_t *request,
-                                               fr_ldap_connection_t **pconn, fr_pair_t *check)
+                                               fr_ldap_connection_t **pconn, fr_pair_t const *check)
 {
        fr_ldap_rcode_t status;
 
@@ -645,7 +645,7 @@ unlang_action_t rlm_ldap_check_groupobj_dynamic(rlm_rcode_t *p_result, rlm_ldap_
  */
 unlang_action_t rlm_ldap_check_userobj_dynamic(rlm_rcode_t *p_result, rlm_ldap_t const *inst, request_t *request,
                                               fr_ldap_connection_t **pconn,
-                                              char const *dn, fr_pair_t *check)
+                                              char const *dn, fr_pair_t const *check)
 {
        rlm_rcode_t     rcode = RLM_MODULE_NOTFOUND, ret;
        fr_ldap_rcode_t status;
@@ -831,7 +831,7 @@ finish:
  * @param[in] check            vp containing the group value (name or dn).
  */
 unlang_action_t rlm_ldap_check_cached(rlm_rcode_t *p_result,
-                                     rlm_ldap_t const *inst, request_t *request, fr_pair_t *check)
+                                     rlm_ldap_t const *inst, request_t *request, fr_pair_t const *check)
 {
        fr_pair_t       *vp;
        int             ret;

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 31eb6092877502d11839328bac66e77318132eed..d4e13c5d75e0363bef390078a1ce52257c1c5b57 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -593,7 +593,7 @@ free_urldesc:
  *     - 1 on failure (or if the user is not a member).
  *     - 0 on success.
  */
-static int rlm_ldap_groupcmp(void *instance, request_t *request, UNUSED fr_pair_list_t *request_list, fr_pair_t *check)
+static int rlm_ldap_groupcmp(void *instance, request_t *request, UNUSED fr_pair_list_t *request_list, fr_pair_t const *check)
 {
        rlm_ldap_t const        *inst = talloc_get_type_abort_const(instance, rlm_ldap_t);
        rlm_rcode_t             rcode;

diff --git a/src/modules/rlm_ldap/rlm_ldap.h b/src/modules/rlm_ldap/rlm_ldap.h
index da4b32a6cc83c989154da48a5276eb43b742c94b..bec6f545a9ef2f27ab491a7af865f13cbaa72cdc 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.h
+++ b/src/modules/rlm_ldap/rlm_ldap.h
@@ -183,14 +183,14 @@ unlang_action_t rlm_ldap_cacheable_groupobj(rlm_rcode_t *p_result,
 
 unlang_action_t rlm_ldap_check_groupobj_dynamic(rlm_rcode_t *p_result,
                                                rlm_ldap_t const *inst, request_t *request, fr_ldap_connection_t **pconn,
-                                               fr_pair_t *check);
+                                               fr_pair_t const *check);
 
 unlang_action_t rlm_ldap_check_userobj_dynamic(rlm_rcode_t *p_result,
                                               rlm_ldap_t const *inst, request_t *request, fr_ldap_connection_t **pconn,
-                                              char const *dn, fr_pair_t *check);
+                                              char const *dn, fr_pair_t const *check);
 
 unlang_action_t rlm_ldap_check_cached(rlm_rcode_t *p_result,
-                                     rlm_ldap_t const *inst, request_t *request, fr_pair_t *check);
+                                     rlm_ldap_t const *inst, request_t *request, fr_pair_t const *check);
 
 /*
  *     conn.c - Connection wrappers.

diff --git a/src/modules/rlm_logintime/rlm_logintime.c b/src/modules/rlm_logintime/rlm_logintime.c
index 505c86456d915d8b0b4d090b441c174651dfbba0..08eaf7e943e68e4f274a7ed7e0eadef966bd6e6a 100644 (file)
--- a/src/modules/rlm_logintime/rlm_logintime.c
+++ b/src/modules/rlm_logintime/rlm_logintime.c
@@ -78,7 +78,7 @@ fr_dict_attr_autoload_t rlm_logintime_dict_attr[] = {
 /*
  *      Compare the current time to a range.
  */
-static int timecmp(UNUSED void *instance, request_t *req, UNUSED fr_pair_list_t *request_list, fr_pair_t *check)
+static int timecmp(UNUSED void *instance, request_t *req, UNUSED fr_pair_list_t *request_list, fr_pair_t const *check)
 {
        /*
         *      If there's a request, use that timestamp.
@@ -93,7 +93,7 @@ static int timecmp(UNUSED void *instance, request_t *req, UNUSED fr_pair_list_t
  *     Time-Of-Day support
  */
 static int time_of_day(UNUSED void *instance, request_t *request,
-                      UNUSED fr_pair_list_t *request_list, fr_pair_t *check)
+                      UNUSED fr_pair_list_t *request_list, fr_pair_t const *check)
 {
        int             scan;
        int             hhmmss, when;

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 256eeaa0ec913c1a71af2ac222c26709f9fe4b2f..63b88ab3577346272e2d4d8722d260267260167f 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -730,10 +730,10 @@ static int sql_get_grouplist(rlm_sql_t const *inst, rlm_sql_handle_t **handle, r
  * username will then be checked with the passed check string.
  */
 static int sql_groupcmp(void *instance, request_t *request, UNUSED fr_pair_list_t *request_list,
-                       fr_pair_t *check) CC_HINT(nonnull (1, 2, 4));
+                       fr_pair_t const *check) CC_HINT(nonnull (1, 2, 4));
 
 static int sql_groupcmp(void *instance, request_t *request, UNUSED fr_pair_list_t *request_list,
-                       fr_pair_t *check)
+                       fr_pair_t const *check)
 {
        rlm_sql_handle_t        *handle;
        rlm_sql_t const         *inst = talloc_get_type_abort_const(instance, rlm_sql_t);

diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
index 5b5769303c9a2f08e3e23d583721e10f5ac8f886..e298b4e6c4211d7ec6e99e6dc630e6bb45c76766 100644 (file)
--- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
+++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
@@ -340,7 +340,7 @@ static ssize_t sqlcounter_expand(char *out, int outlen, rlm_sqlcounter_t const *
 /*
  *     See if the counter matches.
  */
-static int counter_cmp(void *instance, request_t *request, UNUSED fr_pair_list_t *request_list , fr_pair_t *check)
+static int counter_cmp(void *instance, request_t *request, UNUSED fr_pair_list_t *request_list , fr_pair_t const *check)
 {
        rlm_sqlcounter_t const *inst = talloc_get_type_abort_const(instance, rlm_sqlcounter_t);
        uint64_t counter;

diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c
index 7281142362a014b34d363bd702b289cac1073f51..0f1c05ecb2a940912e2be035c69f216d4eb05635 100644 (file)
--- a/src/modules/rlm_test/rlm_test.c
+++ b/src/modules/rlm_test/rlm_test.c
@@ -189,7 +189,7 @@ fr_dict_attr_autoload_t rlm_test_dict_attr[] = {
        { NULL }
 };
 
-static int rlm_test_cmp(UNUSED void *instance, request_t *request, UNUSED fr_pair_list_t *request_list, fr_pair_t *check)
+static int rlm_test_cmp(UNUSED void *instance, request_t *request, UNUSED fr_pair_list_t *request_list, fr_pair_t const *check)
 {
        fr_assert(check->vp_type == FR_TYPE_STRING);
 

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 8a571f4f1efd2e963bd7a244c42757904ecca66b..e01b8f341c609d201a635351165f9e3f600297c9 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -102,7 +102,7 @@ fr_dict_attr_autoload_t rlm_unix_dict_attr[] = {
  *     The Unix-Group = handler.
  */
 static int groupcmp(UNUSED void *instance, request_t *request, UNUSED fr_pair_list_t *request_list,
-                   fr_pair_t *check)
+                   fr_pair_t const *check)
 {
        struct passwd   *pwd;
        struct group    *grp;