Fix incorrect TRACE usages to use {str}

ticket: 8743 (new)
tags: pullup
target_version: 1.16-next
target_version: 1.15-next

diff --git a/src/plugins/preauth/pkinit/pkinit_trace.h b/src/plugins/preauth/pkinit/pkinit_trace.h
index 7f95206c0b11eb5058cc7b7315cdbd5609b2b327..4da735f801813cb5bd3bb5d9fa6ad3fcf5898905 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_trace.h
+++ b/src/plugins/preauth/pkinit/pkinit_trace.h
@@ -74,9 +74,9 @@
 #define TRACE_PKINIT_CLIENT_REQ_RSA(c)                  \
     TRACE(c, "PKINIT client making RSA request")
 #define TRACE_PKINIT_CLIENT_SAN_CONFIG_DNSNAME(c, host)                 \
-    TRACE(c, "PKINIT client config accepts KDC dNSName SAN {string}", host)
+    TRACE(c, "PKINIT client config accepts KDC dNSName SAN {str}", host)
 #define TRACE_PKINIT_CLIENT_SAN_MATCH_DNSNAME(c, host)                  \
-    TRACE(c, "PKINIT client matched KDC hostname {string} against "     \
+    TRACE(c, "PKINIT client matched KDC hostname {str} against "     \
           "dNSName SAN; EKU check still required", host)
 #define TRACE_PKINIT_CLIENT_SAN_MATCH_NONE(c)                           \
     TRACE(c, "PKINIT client found no acceptable SAN in KDC cert")
@@ -86,7 +86,7 @@
 #define TRACE_PKINIT_CLIENT_SAN_ERR(c)                          \
     TRACE(c, "PKINIT client failed to decode SANs in KDC cert")
 #define TRACE_PKINIT_CLIENT_SAN_KDCCERT_DNSNAME(c, host)                \
-    TRACE(c, "PKINIT client found dNSName SAN in KDC cert: {string}", host)
+    TRACE(c, "PKINIT client found dNSName SAN in KDC cert: {str}", host)
 #define TRACE_PKINIT_CLIENT_SAN_KDCCERT_PRINC(c, princ)                 \
     TRACE(c, "PKINIT client found id-pkinit-san in KDC cert: {princ}", princ)
 #define TRACE_PKINIT_CLIENT_TRYAGAIN(c)                                 \

diff --git a/src/plugins/preauth/spake/trace.h b/src/plugins/preauth/spake/trace.h
index 9dd96426096c0e58c429d70fd84eae5f420b56bf..c6e0108788ee2600af9bf74842b355b1cd75a0c3 100644 (file)
--- a/src/plugins/preauth/spake/trace.h
+++ b/src/plugins/preauth/spake/trace.h
@@ -69,6 +69,6 @@
 #define TRACE_SPAKE_SEND_SUPPORT(c)             \
     TRACE(c, "Sending SPAKE support message")
 #define TRACE_SPAKE_UNKNOWN_GROUP(c, name)                      \
-    TRACE(c, "Unrecognized SPAKE group name: {string}", name)
+    TRACE(c, "Unrecognized SPAKE group name: {str}", name)
 
 #endif /* TRACE_H */