[30297] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix incorrect TRACE usages to use {str}
daemon@ATHENA.MIT.EDU (Greg Hudson)
Fri Sep 28 01:04:15 2018
Date: Fri, 28 Sep 2018 01:03:52 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201809280503.w8S53qIt025253@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/3023a7d253c3052897b3d77d2f7ce992ff93e913
commit 3023a7d253c3052897b3d77d2f7ce992ff93e913
Author: Robbie Harwood <rharwood@redhat.com>
Date: Thu Sep 27 17:45:59 2018 -0400
Fix incorrect TRACE usages to use {str}
ticket: 8743 (new)
tags: pullup
target_version: 1.16-next
target_version: 1.15-next
src/plugins/preauth/pkinit/pkinit_trace.h | 6 +++---
src/plugins/preauth/spake/trace.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/preauth/pkinit/pkinit_trace.h b/src/plugins/preauth/pkinit/pkinit_trace.h
index 7f95206..4da735f 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 9dd9642..c6e0108 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 */
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
