Call map_cast_from_hex only for unknown attrs. Addresses #952

FreeRADIUS · Apr 10, 2015 · 0c15725 · 0c15725
1 parent 6b79ea1
commit 0c15725
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/map.c b/src/main/map.c
@@ -231,9 +231,11 @@ int map_afrom_cp(TALLOC_CTX *ctx, value_pair_map_t **out, CONF_PAIR *cp,
 	 */
 	type = cf_pair_value_type(cp);
 
-	if ((type == T_BARE_WORD) && (value[0] == '0') && (tolower((int)value[1] == 'x')) &&
-		map_cast_from_hex(map, type, value)) {
-		/* do nothing */
+	if ((map->lhs->type == TMPL_TYPE_ATTR) &&
+	    map->lhs->tmpl_da->flags.is_unknown &&
+	    !map_cast_from_hex(map, type, value)) {
+		goto error;
+
 	} else {
 		slen = tmpl_afrom_str(map, &map->rhs, value, strlen(value), type, src_request_def, src_list_def, true);
 		if (slen < 0) goto marker;