Perform implicit cast earlier in map_to_vp

Conflicts:
	src/main/map.c

src/main/map.c

@@ -946,7 +946,19 @@ int map_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp_map_t cons
 		new = fr_pair_afrom_da(ctx, map->lhs->tmpl_da);
 		if (!new) return -1;
 
-		if (value_data_copy(new, &new->data, new->da->type, &map->rhs->tmpl_data_value) < 0) goto error;
+		if (map->lhs->tmpl_da->type == map->rhs->tmpl_data_type) {
+			if (value_data_copy(new, &new->data, new->da->type, &map->rhs->tmpl_data_value) < 0) {
+				rcode = -1;
+				goto error;
+			}
+		} else {
+			if (value_data_cast(new, &new->data, new->da->type, new->da, map->rhs->tmpl_data_type,
+					    NULL, &map->rhs->tmpl_data_value) < 0) {
+				REDEBUG("Implicit cast failed: %s", fr_strerror());
+				rcode = -1;
+				goto error;
+			}
+		}
 		new->op = map->op;
 		new->tag = map->lhs->tmpl_tag;
 		*out = new;