From: Robbie Harwood <rharwood@redhat.com>
Date: Thu, 27 Sep 2018 21:45:59 +0000 (-0400)
Subject: Fix incorrect TRACE usages to use {str}
X-Git-Tag: krb5-1.17-beta1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3023a7d253c3052897b3d77d2f7ce992ff93e913;p=thirdparty%2Fkrb5.git

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 7f95206c0b..4da735f801 100644
--- 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 9dd9642609..c6e0108788 100644
--- 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 */