krb5 commit [krb5-1.16]: Fix incorrect TRACE usages to use {str}

Greg Hudson ghudson at mit.edu
Tue Oct 30 12:25:57 EDT 2018


https://github.com/krb5/krb5/commit/90c90d5bc5bd79034b303ef66fdf0da5d72befca
commit 90c90d5bc5bd79034b303ef66fdf0da5d72befca
Author: Robbie Harwood <rharwood at redhat.com>
Date:   Thu Sep 27 17:45:59 2018 -0400

    Fix incorrect TRACE usages to use {str}
    
    (cherry picked from commit 3023a7d253c3052897b3d77d2f7ce992ff93e913)
    
    ticket: 8743
    version_fixed: 1.16.2

 src/plugins/preauth/pkinit/pkinit_trace.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/preauth/pkinit/pkinit_trace.h b/src/plugins/preauth/pkinit/pkinit_trace.h
index 2d95da9..bee2670 100644
--- a/src/plugins/preauth/pkinit/pkinit_trace.h
+++ b/src/plugins/preauth/pkinit/pkinit_trace.h
@@ -72,9 +72,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")
@@ -84,7 +84,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)                                 \


More information about the cvs-krb5 mailing list