clean up error messages for consistency

diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
index 5874ab9f917a677ec1cc1d9dfce5fafb3aaa102c..3fe9269f8c33ddd0465d0ec601e64568cee82576 100644 (file)
--- a/src/lib/server/tmpl.h
+++ b/src/lib/server/tmpl.h
@@ -1012,7 +1012,6 @@ typedef enum {
        TMPL_ATTR_ERROR_NONE = 0,                       //!< No error.
        TMPL_ATTR_ERROR_EMPTY,                          //!< Attribute ref contains no data.
        TMPL_ATTR_ERROR_BAD_PREFIX,                     //!< Missing '&' or has '&' when it shouldn't.
-       TMPL_ATTR_ERROR_INVALID_LIST_QUALIFIER,         //!< List qualifier is invalid.
        TMPL_ATTR_ERROR_LIST_NOT_ALLOWED,               //!< List qualifier is not allowed here.
        TMPL_ATTR_ERROR_LIST_MISSING,                   //!< List qualifier is required, but missing.
        TMPL_ATTR_ERROR_UNKNOWN_NOT_ALLOWED,            //!< Attribute specified as OID, could not be

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index da003563ddc2ac067772542cad397dea9fe2bb4a..ef471905bc44b81b5d2b6c09606b79d887ff9b87 100644 (file)
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -596,8 +596,8 @@ static fr_slen_t tmpl_request_ref_list_from_substr(TALLOC_CTX *ctx, tmpl_attr_er
 
                if (depth == 0) {
                        if (at_rules->namespace || (at_rules->list_presence == TMPL_ATTR_LIST_FORBID)) {
-                               fr_strerror_const("It is not permitted to specify a request reference here");
-                               if (err) *err = TMPL_ATTR_ERROR_INVALID_LIST_QUALIFIER;
+                               fr_strerror_const("List qualifiers are not allowed here");
+                               if (err) *err = TMPL_ATTR_ERROR_LIST_NOT_ALLOWED;
 
                                fr_sbuff_set(&our_in, in);      /* Marker at the start */
                        error: