From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 3 Sep 2019 18:03:54 +0000 (-0400)
Subject: Don't prefix attributes with '&'.  Tends to lead to '&&'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=227eab5fa58fddc634962069a50bc41f344d2ad2;p=thirdparty%2Ffreeradius-server.git

Don't prefix attributes with '&'.  Tends to lead to '&&'
---

diff --git a/src/lib/server/log.c b/src/lib/server/log.c
index a432762e6e7..fd2d963a001 100644
--- a/src/lib/server/log.c
+++ b/src/lib/server/log.c
@@ -749,13 +749,13 @@ void log_request_pair_list(fr_log_lvl_t lvl, REQUEST *request, VALUE_PAIR *vp, c
 		 *	Recursively print grouped attributes.
 		 */
 		if (vp->da->type == FR_TYPE_GROUP) {
-			RDEBUGX(lvl, "%s%s {", prefix ? prefix : "&", vp->da->name);
+			RDEBUGX(lvl, "%s%s {", prefix ? prefix : "", vp->da->name);
 			log_request_pair_list(lvl, request, (VALUE_PAIR *) vp->vp_group, prefix);
 			RDEBUGX(lvl, "%s }", prefix ? prefix : "");
 			continue;
 		}
 
-		RDEBUGX(lvl, "%s%pP", prefix ? prefix : "&", vp);
+		RDEBUGX(lvl, "%s%pP", prefix ? prefix : "", vp);
 	}
 	REXDENT();
 }
@@ -786,13 +786,13 @@ void log_request_proto_pair_list(fr_log_lvl_t lvl, REQUEST *request, VALUE_PAIR
 		 *	Recursively print grouped attributes.
 		 */
 		if (vp->da->type == FR_TYPE_GROUP) {
-			RDEBUGX(lvl, "%s%s {", prefix ? prefix : "&", vp->da->name);
+			RDEBUGX(lvl, "%s%s {", prefix ? prefix : "", vp->da->name);
 			log_request_proto_pair_list(lvl, request, (VALUE_PAIR *) vp->vp_group, prefix);
 			RDEBUGX(lvl, "%s }", prefix ? prefix : "");
 			continue;
 		}
 
-		RDEBUGX(lvl, "%s%pP", prefix ? prefix : "&", vp);
+		RDEBUGX(lvl, "%s%pP", prefix ? prefix : "", vp);
 	}
 	REXDENT();
 }