From: Tom Yu <tlyu@mit.edu>
Date: Tue, 8 Nov 2011 20:42:02 +0000 (+0000)
Subject: pull up r25417 from trunk
X-Git-Tag: krb5-1.9.3-final~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f5c837bb9dffa6d1d3449f4c7fad4be8e9a41c2a;p=krb5.git

pull up r25417 from trunk

 ------------------------------------------------------------------------
 r25417 | ghudson | 2011-10-26 18:34:21 -0400 (Wed, 26 Oct 2011) | 7 lines

 ticket: 6993
 subject: Fix format string for TRACE_INIT_CREDS_SERVICE
 tags: pullup
 target_version: 1.9.2

 This should also be pulled up to 1.10.

ticket: 6993
version_fixed: 1.9.3
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@25458 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/k5-trace.h b/src/include/k5-trace.h
index b85e59c7d..26bf68a14 100644
--- a/src/include/k5-trace.h
+++ b/src/include/k5-trace.h
@@ -175,7 +175,7 @@
 #define TRACE_INIT_CREDS_SALT_PRINC(c, salt) \
     TRACE(c, (c, "Salt derived from principal: {data}", salt))
 #define TRACE_INIT_CREDS_SERVICE(c, service) \
-    TRACE(c, (c, "Setting initial creds service to {string}", service))
+    TRACE(c, (c, "Setting initial creds service to {str}", service))
 
 #define TRACE_KT_GET_ENTRY(c, keytab, princ, vno, enctype, err) \
     TRACE(c, (c, "Retrieving {princ} from {keytab} (vno {int}, " \