From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 1 Apr 2020 01:34:14 +0000 (-0600)
Subject: log: Fix marker indentation in fr_log_hex_marker
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd02185cef3e07ef0647d33e5b73c7cc3a2d993c;p=thirdparty%2Ffreeradius-server.git

log: Fix marker indentation in fr_log_hex_marker
---

diff --git a/src/lib/util/log.c b/src/lib/util/log.c
index 4fadb2b16a9..760064dd4ea 100644
--- a/src/lib/util/log.c
+++ b/src/lib/util/log.c
@@ -670,7 +670,12 @@ void fr_log_hex_marker(fr_log_t const *log, fr_log_type_t type, char const *file
 		 *	Marker is on this line
 		 */
 		if (((size_t)slen >= i) && ((size_t)slen < (i + 0x10))) {
-			fr_log(log, type, file, line, "%.*s^ %s", (int)((slen - i) * 3), spaces, error);
+			if (fmt) {
+				fr_log(log, type, file, line, "%pV      %.*s^ %s", fr_box_strvalue_buffer(prefix),
+				       (int)((slen - i) * 3), spaces, error);
+			} else {
+				fr_log(log, type, file, line, "      %.*s^ %s", (int)((slen - i) * 3), spaces, error);
+			}
 		}
 	}