]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
fr_dict_attr_by_name_substr sets its own errors
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Wed, 23 Oct 2024 06:08:43 +0000 (00:08 -0600)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 24 Oct 2024 23:07:56 +0000 (17:07 -0600)
src/lib/util/dict_util.c

index 5b7a2c816bbab1e26a39474706aad446174ee7f8..958e3adbee40e26d043dbe0933a9f3443cfd5084 100644 (file)
@@ -2038,7 +2038,7 @@ fr_slen_t fr_dict_oid_component(fr_dict_attr_err_t *err,
 
                child = dict_attr_child_by_num(parent, num);
                if (!child) {
-                       fr_strerror_printf("Failed resolving child %u in context %s",
+                       fr_strerror_printf("Failed resolving child %u in namespace '%s'",
                                           num, parent->name);
                        if (err) *err = FR_DICT_ATTR_NOTFOUND;
                        FR_SBUFF_ERROR_RETURN(&our_in);
@@ -2053,11 +2053,8 @@ fr_slen_t fr_dict_oid_component(fr_dict_attr_err_t *err,
        {
                fr_dict_attr_err_t      our_err;
        oid_str:
+               /* Sets its own errors, don't override */
                if (fr_dict_attr_by_name_substr(&our_err, &child, parent, &our_in, tt) < 0) {
-                       fr_strerror_printf("Failed resolving \"%.*s\" in context %s",
-                                          (int)fr_sbuff_remaining(&our_in),
-                                          fr_sbuff_current(&our_in),
-                                          parent->name);
                        if (err) *err = our_err;
                        FR_SBUFF_ERROR_RETURN(&our_in);
                }