be more aggressive about checking for user name/password

when updating maps.  We don't want to catch VSAs, or other
attributes...

diff --git a/src/main/map.c b/src/main/map.c
index d6c6b16bc6dec13de16e71baee08aa46b6855b86..6391be5ea0fab9d021a60a6b632ad1b98540fcbc 100644 (file)
--- a/src/main/map.c
+++ b/src/main/map.c
@@ -1438,8 +1438,10 @@ finish:
                     vp;
                     vp = fr_pair_cursor_next(&src_list)) {
 
+                       if (!vp->da->parent->flags.is_root) continue;
                        if (vp->da->vendor != 0) continue;
                        if (vp->da->flags.has_tag) continue;
+                       if (vp->da->type != PW_TYPE_STRING) continue;
 
                        if (!context->username && (vp->da->attr == PW_USER_NAME)) {
                                context->username = vp;