map->dst->tmpl_da can be NULL if it's not TMPL_TYPE_ATTR

diff --git a/src/main/map.c b/src/main/map.c
index 2bd56afbbd85628d798bb25550e57e0de36a5781..b43507275efcdb68fb551a3635f71504c206c276 100644 (file)
--- a/src/main/map.c
+++ b/src/main/map.c
@@ -623,10 +623,18 @@ int map_to_vp(VALUE_PAIR **out, REQUEST *request, value_pair_map_t const *map, U
        {
                vp_cursor_t from;
 
-               rad_assert(!map->dst->tmpl_da ||
-                          (map->src->tmpl_da->type == map->dst->tmpl_da->type) ||
-                          (map->src->tmpl_da->type == PW_TYPE_OCTETS) ||
-                          (map->dst->tmpl_da->type == PW_TYPE_OCTETS));
+               if (map->dst->type != TMPL_TYPE_ATTR) {
+                       rad_assert(map->dst->tmpl_da == NULL);
+               } else {
+                       rad_assert(map->dst->tmpl_da != NULL);
+
+                       /*
+                        *      Matching type, OR src/dst is octets.
+                        */
+                       rad_assert((map->src->tmpl_da->type == map->dst->tmpl_da->type) ||
+                                  (map->src->tmpl_da->type == PW_TYPE_OCTETS) ||
+                                  (map->dst->tmpl_da->type == PW_TYPE_OCTETS));
+               }
 
                /*
                 * @todo should log error, and return -1 for v3.1 (causes update to fail)
@@ -634,11 +642,13 @@ int map_to_vp(VALUE_PAIR **out, REQUEST *request, value_pair_map_t const *map, U
                if (tmpl_copy_vps(request, &found, request, map->src) < 0) return 0;
 
                vp = fr_cursor_init(&from, &found);
+
                /*
                 *  Src/Dst attributes don't match, convert src attributes
                 *  to match dst.
                 */
-               if (map->src->tmpl_da->type != map->dst->tmpl_da->type) {
+               if ((map->dst->type == TMPL_TYPE_ATTR) &&
+                   (map->src->tmpl_da->type != map->dst->tmpl_da->type)) {
                        vp_cursor_t to;
 
                        (void) fr_cursor_init(&to, out);