Minor cleanups

diff --git a/src/lib/util/dict.c b/src/lib/util/dict.c
index e264a0521540800278871c1c9696b1aa777cc9e9..99aaba41bf18d93c9cf48efeb7383e40d1e3c4cf 100644 (file)
--- a/src/lib/util/dict.c
+++ b/src/lib/util/dict.c
@@ -3198,8 +3198,8 @@ fr_dict_attr_t const *fr_dict_attr_by_name(fr_dict_t const *dict, char const *na
  *                             - -1 if the attribute can't be found.
  *                             - -2 attribute name is too long.
  *                             - -3 if the protocol can't be found.
- *                             - -4 out of memory.
- *                             - -5 parsing / format error
+ *                             - -4 parsing / format error.
+ *                             - -5 out of memory.
  * @param[out] out             Dictionary found attribute.
  * @param[in] dict_def         Default dictionary for non-qualified dictionaries.
  * @param[in] attr             Dictionary/Attribute name.
@@ -3292,8 +3292,10 @@ again:
  * @return
  *     - 0 on success.
  *     - -1 if the attribute can't be found.
- *     - -2 if the protocol can't be found.
- *     - -3 trailing garbage in attr atring.
+ *     - -2 attribute name is too long.
+ *     - -3 if the protocol can't be found.
+ *     - -4 parsing / format error.
+ *     - -5 out of memory.
  */
 int fr_dict_attr_by_qualified_name(fr_dict_attr_t const **out, fr_dict_t const *dict_def,
                                   char const *attr, bool fallback)
@@ -3306,7 +3308,7 @@ int fr_dict_attr_by_qualified_name(fr_dict_attr_t const **out, fr_dict_t const *
 
        if ((size_t)slen != strlen(attr)) {
                fr_strerror_printf("Trailing garbage after attr string \"%s\"", attr);
-               return -3;
+               return -4;
        }
 
        return 0;
@@ -5259,7 +5261,10 @@ int fr_dict_attr_autoload(fr_dict_attr_autoload_t const *to_load)
                }
 
                if (!*p->dict) {
-                       fr_strerror_printf("Dictionary was not already loaded for attribute \"%s\"", p->name);
+                       fr_strerror_printf("Can't resolve attribute \"%s\", dictionary not loaded", p->name);
+                       fr_strerror_printf_push("Check exported fr_dict_autoload_t struct has "
+                                               "an entry to load the dictionary \"%s\" is located in, and that "
+                                               "the symbol name is correct", p->name);
                        return -1;
                }
 

diff --git a/src/modules/rlm_eap/lib/sim/base.c b/src/modules/rlm_eap/lib/sim/base.c
index ec7f369d596b24a78cdf4ef7dd2fa19dbc0af0bc..ca0f78d1abf11043373e9be476017b3b38b57706 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/base.c
+++ b/src/modules/rlm_eap/lib/sim/base.c
@@ -185,11 +185,11 @@ int fr_sim_init(void)
        }
 
        if (fr_dict_autoload(libfreeradius_sim_dict) < 0) {
-               PERROR("Failed loading SIM dictionary");
+               PERROR("Failed loading libfreeradius-sim dictionaries");
                return -1;
        }
        if (fr_dict_attr_autoload(libfreeradius_sim_dict_attr) < 0) {
-               PERROR("Failed loading SIM attributes");
+               PERROR("Failed loading libfreeradius-sim attributes");
                fr_dict_autofree(libfreeradius_sim_dict);
                return -1;
        }

diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
index 7a253e87e84f1aab1908d04c7a7b31e880bec360..98d0080391b10be083ba5d940451fdbb93ca9295 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
@@ -1148,10 +1148,7 @@ static rlm_rcode_t mod_session_init(void *instance, eap_session_t *eap_session)
 
 static int mod_load(void)
 {
-       if (fr_sim_init() < 0) {
-               ERROR("Failed initializing SIM library");
-               return -1;
-       }
+       if (fr_sim_init() < 0) return -1;
 
        sim_xlat_register();