Un-tagged attributes can *never* have tags

diff --git a/src/main/tmpl.c b/src/main/tmpl.c
index d2d6aa2..0c909ef 100644 (file)
--- a/src/main/tmpl.c
+++ b/src/main/tmpl.c
@@ -773,20 +773,17 @@ ssize_t tmpl_from_attr_substr(value_pair_tmpl_t *vpt, char const *name,
         *      The string MIGHT have a tag.
         */
        if (*p == ':') {
+               if (!attr.da->flags.has_tag) {
+                       fr_strerror_printf("Attribute '%s' cannot have a tag", attr.da->name);
+                       return -(p - name);
+               }
+
                num = strtol(p + 1, &q, 10);
                if ((num > 0x1f) || (num < 0)) {
                        fr_strerror_printf("Invalid tag value '%li' (should be between 0-31)", num);
                        return -((p + 1)- name);
                }
 
-               if (!attr.da->flags.has_tag) {
-                       if (num != TAG_NONE) {
-                               fr_strerror_printf("Attribute '%s' cannot have a tag", attr.da->name);
-                               return -(p - name);
-                       }
-                       num = TAG_ANY;
-               }
-
                attr.tag = num;
                p = q;
        }

diff --git a/src/tests/unit/condition.txt b/src/tests/unit/condition.txt
index dc17845..b70f9c4 100644 (file)
--- a/src/tests/unit/condition.txt
+++ b/src/tests/unit/condition.txt
@@ -552,11 +552,10 @@ condition &User-Name:10 == 'test'
 data ERROR offset 10 Attribute 'User-Name' cannot have a tag
 
 #
-#  Tag zero is technically allowed for non-tagged attributes
-#  but should be ignored.
+#  Tags are always wrong for attributes which aren't tagged.
 #
 condition &User-Name:0 == 'test'
-data &User-Name == 'test'
+data ERROR offset 10 Attribute 'User-Name' cannot have a tag
 
 #
 #  Bounds checks...