From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 21 Dec 2016 21:23:50 +0000 (-0500)
Subject: be more aggressive about checking for user name/password
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd54e152dca7a9b586cb286c62f51cb4e31508cb;p=thirdparty%2Ffreeradius-server.git

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 d6c6b16bc6d..6391be5ea0f 100644
--- 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;