Fix editor error

FreeRADIUS · Oct 3, 2014 · c4d5fa6 · c4d5fa6
1 parent 54909a7
commit c4d5fa6
Showing 1 changed file with 5 additions and 8 deletions.
diff --git 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;
 	}