svn rev #25852: trunk/src/include/
ghudson@MIT.EDU
ghudson at MIT.EDU
Mon May 7 23:04:07 EDT 2012
http://src.mit.edu/fisheye/changelog/krb5/?cs=25852
Commit By: ghudson
Log Message:
Use variadic macros to simplify k5-trace.h
Also fix the facility to make it possible to trace log without
including k5-int.h.
Changed Files:
U trunk/src/include/k5-int.h
U trunk/src/include/k5-trace.h
Modified: trunk/src/include/k5-int.h
===================================================================
--- trunk/src/include/k5-int.h 2012-05-05 17:03:50 UTC (rev 25851)
+++ trunk/src/include/k5-int.h 2012-05-08 03:04:07 UTC (rev 25852)
@@ -130,7 +130,6 @@
#include "k5-platform.h"
-#include "k5-trace.h"
/* not used in krb5.h (yet) */
typedef UINT64_TYPE krb5_ui_8;
typedef INT64_TYPE krb5_int64;
@@ -183,6 +182,9 @@
/* Get string buffer support. */
#include "k5-buf.h"
+/* Define tracing macros. */
+#include "k5-trace.h"
+
/* cofiguration variables */
#define KRB5_CONF_ACL_FILE "acl_file"
#define KRB5_CONF_ADMIN_SERVER "admin_server"
@@ -2605,7 +2607,6 @@
#ifndef DISABLE_TRACING
/* Do not use these functions directly; see k5-trace.h. */
void krb5int_init_trace(krb5_context context);
-void krb5int_trace(krb5_context context, const char *fmt, ...);
#endif
#endif /* _KRB5_INT_H */
Modified: trunk/src/include/k5-trace.h
===================================================================
--- trunk/src/include/k5-trace.h 2012-05-05 17:03:50 UTC (rev 25851)
+++ trunk/src/include/k5-trace.h 2012-05-08 03:04:07 UTC (rev 25852)
@@ -79,305 +79,309 @@
#ifndef K5_TRACE_H
#define K5_TRACE_H
-#if defined(DISABLE_TRACING)
-#define TRACE(ctx, args)
-#elif defined(_KRB5_INT_H)
-#define TRACE(ctx, args) \
- do { if (ctx->trace_callback != NULL) krb5int_trace args; } while (0)
+#ifdef DISABLE_TRACING
+#define TRACE(ctx, ...)
#else
-/* This source file isn't using k5-int.h and doesn't know the internals of the
- * context structure, so don't try to optimize away the call. */
-#define TRACE(ctx, args) krb5int_trace args
+
+void krb5int_trace(krb5_context context, const char *fmt, ...);
+
+/* Try to optimize away argument evaluation and function call when we're not
+ * tracing, if this source file knows the internals of the context. */
+#ifdef _KRB5_INT_H
+#define TRACE(ctx, ...) \
+ do { if (ctx->trace_callback != NULL) \
+ krb5int_trace(ctx, __VA_ARGS__); } while (0)
+#else
+#define TRACE(ctx, ...) krb5int_trace(ctx, __VA_ARGS__)
#endif
+#endif /* DISABLE_TRACING */
+
#define TRACE_CC_DESTROY(c, cache) \
- TRACE(c, (c, "Destroying ccache {ccache}", cache))
+ TRACE(c, "Destroying ccache {ccache}", cache)
#define TRACE_CC_GEN_NEW(c, cache) \
- TRACE(c, (c, "Generating new unique ccache based on {ccache}", cache))
-#define TRACE_CC_GET_CONFIG(c, cache, princ, key, data) \
- TRACE(c, (c, "Read config in {ccache} for {princ}: {str}: {data}", \
- cache, princ, key, data))
-#define TRACE_CC_INIT(c, cache, princ) \
- TRACE(c, (c, "Initializing {ccache} with default princ {princ}", \
- cache, princ))
+ TRACE(c, "Generating new unique ccache based on {ccache}", cache)
+#define TRACE_CC_GET_CONFIG(c, cache, princ, key, data) \
+ TRACE(c, "Read config in {ccache} for {princ}: {str}: {data}", \
+ cache, princ, key, data)
+#define TRACE_CC_INIT(c, cache, princ) \
+ TRACE(c, "Initializing {ccache} with default princ {princ}", \
+ cache, princ)
#define TRACE_CC_MOVE(c, src, dst) \
- TRACE(c, (c, "Moving contents of ccache {src} to {dst}", src, dst))
-#define TRACE_CC_NEW_UNIQUE(c, type) \
- TRACE(c, (c, "Resolving unique ccache of type {str}", type))
-#define TRACE_CC_REMOVE(c, cache, creds) \
- TRACE(c, (c, "Removing {creds} from {ccache}", creds, cache))
-#define TRACE_CC_RETRIEVE(c, cache, creds, ret) \
- TRACE(c, (c, "Retrieving {creds} from {ccache} with result: {kerr}", \
- creds, cache, ret))
+ TRACE(c, "Moving contents of ccache {src} to {dst}", src, dst)
+#define TRACE_CC_NEW_UNIQUE(c, type) \
+ TRACE(c, "Resolving unique ccache of type {str}", type)
+#define TRACE_CC_REMOVE(c, cache, creds) \
+ TRACE(c, "Removing {creds} from {ccache}", creds, cache)
+#define TRACE_CC_RETRIEVE(c, cache, creds, ret) \
+ TRACE(c, "Retrieving {creds} from {ccache} with result: {kerr}", \
+ creds, cache, ret)
#define TRACE_CC_RETRIEVE_REF(c, cache, creds, ret) \
- TRACE(c, (c, "Retrying {creds} with result: {kerr}", creds, ret))
-#define TRACE_CC_SET_CONFIG(c, cache, princ, key, data) \
- TRACE(c, (c, "Storing config in {ccache} for {princ}: {str}: {data}", \
- cache, princ, key, data))
+ TRACE(c, "Retrying {creds} with result: {kerr}", creds, ret)
+#define TRACE_CC_SET_CONFIG(c, cache, princ, key, data) \
+ TRACE(c, "Storing config in {ccache} for {princ}: {str}: {data}", \
+ cache, princ, key, data)
#define TRACE_CC_STORE(c, cache, creds) \
- TRACE(c, (c, "Storing {creds} in {ccache}", creds, cache))
-#define TRACE_CC_STORE_TKT(c, cache, creds) \
- TRACE(c, (c, "Also storing {creds} based on ticket", creds))
+ TRACE(c, "Storing {creds} in {ccache}", creds, cache)
+#define TRACE_CC_STORE_TKT(c, cache, creds) \
+ TRACE(c, "Also storing {creds} based on ticket", creds)
#define TRACE_CCSELECT_VTINIT_FAIL(c, ret) \
- TRACE(c, (c, "ccselect module failed to init vtable: {kerr}", ret))
+ TRACE(c, "ccselect module failed to init vtable: {kerr}", ret)
#define TRACE_CCSELECT_INIT_FAIL(c, name, ret) \
- TRACE(c, (c, "ccselect module {str} failed to init: {kerr}", name, ret))
+ TRACE(c, "ccselect module {str} failed to init: {kerr}", name, ret)
#define TRACE_CCSELECT_MODCHOICE(c, name, server, cache, princ) \
- TRACE(c, (c, "ccselect module {str} chose cache {ccache} with client " \
- "principal {princ} for server principal {princ}", name, cache, \
- princ, server))
+ TRACE(c, "ccselect module {str} chose cache {ccache} with client " \
+ "principal {princ} for server principal {princ}", name, cache, \
+ princ, server)
#define TRACE_CCSELECT_MODNOTFOUND(c, name, server, princ) \
- TRACE(c, (c, "ccselect module {str} chose client principal {princ} " \
- "for server principal {princ} but found no cache", name, princ, \
- server))
-#define TRACE_CCSELECT_MODFAIL(c, name, ret, server) \
- TRACE(c, (c, "ccselect module {str} yielded error {kerr} for server " \
- "principal {princ}", name, ret, server))
-#define TRACE_CCSELECT_NOTFOUND(c, server) \
- TRACE(c, (c, "ccselect can't find appropriate cache for server " \
- "principal {princ}", server))
-#define TRACE_CCSELECT_DEFAULT(c, cache, server) \
- TRACE(c, (c, "ccselect choosing default cache {ccache} for server " \
- "principal {princ}", cache, server))
+ TRACE(c, "ccselect module {str} chose client principal {princ} " \
+ "for server principal {princ} but found no cache", name, princ, \
+ server)
+#define TRACE_CCSELECT_MODFAIL(c, name, ret, server) \
+ TRACE(c, "ccselect module {str} yielded error {kerr} for server " \
+ "principal {princ}", name, ret, server)
+#define TRACE_CCSELECT_NOTFOUND(c, server) \
+ TRACE(c, "ccselect can't find appropriate cache for server " \
+ "principal {princ}", server)
+#define TRACE_CCSELECT_DEFAULT(c, cache, server) \
+ TRACE(c, "ccselect choosing default cache {ccache} for server " \
+ "principal {princ}", cache, server)
-#define TRACE_FAST_ARMOR_CCACHE(c, ccache_name) \
- TRACE(c, (c, "FAST armor ccache: {str}", ccache_name))
-#define TRACE_FAST_ARMOR_CCACHE_KEY(c, keyblock) \
- TRACE(c, (c, "Armor ccache sesion key: {keyblock}", keyblock))
-#define TRACE_FAST_ARMOR_KEY(c, keyblock) \
- TRACE(c, (c, "FAST armor key: {keyblock}", keyblock))
+#define TRACE_FAST_ARMOR_CCACHE(c, ccache_name) \
+ TRACE(c, "FAST armor ccache: {str}", ccache_name)
+#define TRACE_FAST_ARMOR_CCACHE_KEY(c, keyblock) \
+ TRACE(c, "Armor ccache sesion key: {keyblock}", keyblock)
+#define TRACE_FAST_ARMOR_KEY(c, keyblock) \
+ TRACE(c, "FAST armor key: {keyblock}", keyblock)
#define TRACE_FAST_CCACHE_CONFIG(c) \
- TRACE(c, (c, "Using FAST due to armor ccache negotiation result"))
+ TRACE(c, "Using FAST due to armor ccache negotiation result")
#define TRACE_FAST_DECODE(c) \
- TRACE(c, (c, "Decoding FAST response"))
+ TRACE(c, "Decoding FAST response")
#define TRACE_FAST_ENCODE(c) \
- TRACE(c, (c, "Encoding request body and padata into FAST request"))
+ TRACE(c, "Encoding request body and padata into FAST request")
#define TRACE_FAST_NEGO(c, avail) \
- TRACE(c, (c, "FAST negotiation: {str}available", (avail) ? "" : "un"))
+ TRACE(c, "FAST negotiation: {str}available", (avail) ? "" : "un")
#define TRACE_FAST_PADATA_UPGRADE(c) \
- TRACE(c, (c, "Upgrading to FAST due to presence of PA_FX_FAST in reply"))
+ TRACE(c, "Upgrading to FAST due to presence of PA_FX_FAST in reply")
#define TRACE_FAST_REPLY_KEY(c, keyblock) \
- TRACE(c, (c, "FAST reply key: {keyblock}", keyblock))
+ TRACE(c, "FAST reply key: {keyblock}", keyblock)
#define TRACE_FAST_REQUIRED(c) \
- TRACE(c, (c, "Using FAST due to KRB5_FAST_REQUIRED flag"))
+ TRACE(c, "Using FAST due to KRB5_FAST_REQUIRED flag")
#define TRACE_GIC_PWD_CHANGED(c) \
- TRACE(c, (c, "Getting initial TGT with changed password"))
+ TRACE(c, "Getting initial TGT with changed password")
#define TRACE_GIC_PWD_CHANGEPW(c, tries) \
- TRACE(c, (c, "Attempting password change; {int} tries remaining", tries))
+ TRACE(c, "Attempting password change; {int} tries remaining", tries)
#define TRACE_GIC_PWD_EXPIRED(c) \
- TRACE(c, (c, "Principal expired; getting changepw ticket"))
-#define TRACE_GIC_PWD_MASTER(c) \
- TRACE(c, (c, "Retrying AS request with master KDC"))
+ TRACE(c, "Principal expired; getting changepw ticket")
+#define TRACE_GIC_PWD_MASTER(c) \
+ TRACE(c, "Retrying AS request with master KDC")
#define TRACE_ENCTYPE_LIST_UNKNOWN(c, profvar, name) \
- TRACE(c, (c, "Unrecognized enctype name in {str}: {str}", profvar, name))
+ TRACE(c, "Unrecognized enctype name in {str}: {str}", profvar, name)
-#define TRACE_INIT_CREDS(c, princ) \
- TRACE(c, (c, "Getting initial credentials for {princ}", princ))
+#define TRACE_INIT_CREDS(c, princ) \
+ TRACE(c, "Getting initial credentials for {princ}", princ)
#define TRACE_INIT_CREDS_AS_KEY_GAK(c, keyblock) \
- TRACE(c, (c, "AS key obtained from gak_fct: {keyblock}", keyblock))
+ TRACE(c, "AS key obtained from gak_fct: {keyblock}", keyblock)
#define TRACE_INIT_CREDS_AS_KEY_PREAUTH(c, keyblock) \
- TRACE(c, (c, "AS key determined by preauth: {keyblock}", keyblock))
+ TRACE(c, "AS key determined by preauth: {keyblock}", keyblock)
#define TRACE_INIT_CREDS_DECRYPTED_REPLY(c, keyblock) \
- TRACE(c, (c, "Decrypted AS reply; session key is: {keyblock}", keyblock))
-#define TRACE_INIT_CREDS_ERROR_REPLY(c, code) \
- TRACE(c, (c, "Received error from KDC: {kerr}", code))
-#define TRACE_INIT_CREDS_GAK(c, salt, s2kparams) \
- TRACE(c, (c, "Getting AS key, salt \"{data}\", params \"{data}\"", \
- salt, s2kparams))
-#define TRACE_INIT_CREDS_KEYTAB_LOOKUP(c, etypes) \
- TRACE(c, (c, "Looked up etypes in keytab: {etypes}", etypes))
-#define TRACE_INIT_CREDS_KEYTAB_LOOKUP_FAILED(c, code) \
- TRACE(c, (c, "Couldn't lookup etypes in keytab: {kerr}", code))
+ TRACE(c, "Decrypted AS reply; session key is: {keyblock}", keyblock)
+#define TRACE_INIT_CREDS_ERROR_REPLY(c, code) \
+ TRACE(c, "Received error from KDC: {kerr}", code)
+#define TRACE_INIT_CREDS_GAK(c, salt, s2kparams) \
+ TRACE(c, "Getting AS key, salt \"{data}\", params \"{data}\"", \
+ salt, s2kparams)
+#define TRACE_INIT_CREDS_KEYTAB_LOOKUP(c, etypes) \
+ TRACE(c, "Looked up etypes in keytab: {etypes}", etypes)
+#define TRACE_INIT_CREDS_KEYTAB_LOOKUP_FAILED(c, code) \
+ TRACE(c, "Couldn't lookup etypes in keytab: {kerr}", code)
#define TRACE_INIT_CREDS_PREAUTH_DECRYPT_FAIL(c, code) \
- TRACE(c, (c, "Decrypt with preauth AS key failed: {kerr}", code))
-#define TRACE_INIT_CREDS_RESTART_FAST(c) \
- TRACE(c, (c, "Restarting to upgrade to FAST"))
+ TRACE(c, "Decrypt with preauth AS key failed: {kerr}", code)
+#define TRACE_INIT_CREDS_RESTART_FAST(c) \
+ TRACE(c, "Restarting to upgrade to FAST")
#define TRACE_INIT_CREDS_RESTART_PREAUTH_FAILED(c) \
- TRACE(c, (c, "Restarting due to PREAUTH_FAILED from FAST negotiation"))
+ TRACE(c, "Restarting due to PREAUTH_FAILED from FAST negotiation")
#define TRACE_INIT_CREDS_REFERRAL(c, realm) \
- TRACE(c, (c, "Following referral to realm {data}", realm))
+ TRACE(c, "Following referral to realm {data}", realm)
#define TRACE_INIT_CREDS_RETRY_TCP(c) \
- TRACE(c, (c, "Request or response is too big for UDP; retrying with TCP"))
+ TRACE(c, "Request or response is too big for UDP; retrying with TCP")
#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 {str}", service))
+ TRACE(c, "Salt derived from principal: {data}", salt)
+#define TRACE_INIT_CREDS_SERVICE(c, service) \
+ TRACE(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}, " \
- "enctype {etype}) with result: {kerr}", princ, keytab, \
- (int) vno, enctype, err))
+ TRACE(c, "Retrieving {princ} from {keytab} (vno {int}, enctype {etype}) " \
+ "with result: {kerr}", princ, keytab, (int) vno, enctype, err)
#define TRACE_MK_REP(c, ctime, cusec, subkey, seqnum) \
- TRACE(c, (c, "Creating AP-REP, time {long}.{int}, subkey {keyblock}, " \
- "seqnum {int}", (long) ctime, (int) cusec, subkey, (int) seqnum))
+ TRACE(c, "Creating AP-REP, time {long}.{int}, subkey {keyblock}, " \
+ "seqnum {int}", (long) ctime, (int) cusec, subkey, (int) seqnum)
#define TRACE_MK_REQ(c, creds, seqnum, subkey, sesskeyblock) \
- TRACE(c, (c, "Creating authenticator for {creds}, seqnum {int}, " \
- "subkey {key}, session key {keyblock}", creds, (int) seqnum, \
- subkey, sesskeyblock))
+ TRACE(c, "Creating authenticator for {creds}, seqnum {int}, " \
+ "subkey {key}, session key {keyblock}", creds, (int) seqnum, \
+ subkey, sesskeyblock)
#define TRACE_MK_REQ_ETYPES(c, etypes) \
- TRACE(c, (c, "Negotiating for enctypes in authenticator: {etypes}", \
- etypes))
+ TRACE(c, "Negotiating for enctypes in authenticator: {etypes}", etypes)
-#define TRACE_MSPAC_VERIFY_FAIL(c, err) \
- TRACE(c, (c, "PAC checksum verification failed: {kerr}", err))
-#define TRACE_MSPAC_DISCARD_UNVERF(c) \
- TRACE(c, (c, "Filtering out unverified MS PAC"))
+#define TRACE_MSPAC_VERIFY_FAIL(c, err) \
+ TRACE(c, "PAC checksum verification failed: {kerr}", err)
+#define TRACE_MSPAC_DISCARD_UNVERF(c) \
+ TRACE(c, "Filtering out unverified MS PAC")
-#define TRACE_PREAUTH_COOKIE(c, len, data) \
- TRACE(c, (c, "Received cookie: {lenstr}", (size_t) len, data))
+#define TRACE_PREAUTH_COOKIE(c, len, data) \
+ TRACE(c, "Received cookie: {lenstr}", (size_t) len, data)
#define TRACE_PREAUTH_ENC_TS_KEY_GAK(c, keyblock) \
- TRACE(c, (c, "AS key obtained for encrypted timestamp: {keyblock}", \
- keyblock))
+ TRACE(c, "AS key obtained for encrypted timestamp: {keyblock}", keyblock)
#define TRACE_PREAUTH_ENC_TS(c, sec, usec, plain, enc) \
- TRACE(c, (c, "Encrypted timestamp (for {long}.{int}): plain {hexdata}, " \
- "encrypted {hexdata}", (long) sec, (int) usec, plain, enc))
-#define TRACE_PREAUTH_ETYPE_INFO(c, etype, salt, s2kparams) \
- TRACE(c, (c, "Selected etype info: etype {etype}, salt \"{data}\", " \
- "params \"{data}\"", etype, salt, s2kparams))
+ TRACE(c, "Encrypted timestamp (for {long}.{int}): plain {hexdata}, " \
+ "encrypted {hexdata}", (long) sec, (int) usec, plain, enc)
+#define TRACE_PREAUTH_ETYPE_INFO(c, etype, salt, s2kparams) \
+ TRACE(c, "Selected etype info: etype {etype}, salt \"{data}\", " \
+ "params \"{data}\"", etype, salt, s2kparams)
#define TRACE_PREAUTH_INFO_FAIL(c, patype, code) \
- TRACE(c, (c, "Preauth builtin info function failure, type={int}: {kerr}", \
- (int) patype, code))
-#define TRACE_PREAUTH_INPUT(c, padata) \
- TRACE(c, (c, "Processing preauth types: {patypes}", padata))
+ TRACE(c, "Preauth builtin info function failure, type={int}: {kerr}", \
+ (int) patype, code)
+#define TRACE_PREAUTH_INPUT(c, padata) \
+ TRACE(c, "Processing preauth types: {patypes}", padata)
#define TRACE_PREAUTH_OUTPUT(c, padata) \
- TRACE(c, (c, "Produced preauth for next request: {patypes}", padata))
-#define TRACE_PREAUTH_PROCESS(c, name, patype, flags, code) \
- TRACE(c, (c, "Preauth module {str} ({int}) (flags={int}) returned: " \
- "{kerr}", name, (int) patype, flags, code))
-#define TRACE_PREAUTH_SAM_KEY_GAK(c, keyblock) \
- TRACE(c, (c, "AS key obtained for SAM: {keyblock}", keyblock))
-#define TRACE_PREAUTH_SALT(c, salt, patype) \
- TRACE(c, (c, "Received salt \"{data}\" via padata type {int}", salt, \
- (int) patype))
-#define TRACE_PREAUTH_SKIP(c, name, patype) \
- TRACE(c, (c, "Skipping previously used preauth module {str} ({int})", \
- name, (int) patype))
-#define TRACE_PREAUTH_TRYAGAIN_INPUT(c, padata) \
- TRACE(c, (c, "Preauth tryagain input types: {patypes}", padata))
+ TRACE(c, "Produced preauth for next request: {patypes}", padata)
+#define TRACE_PREAUTH_PROCESS(c, name, patype, flags, code) \
+ TRACE(c, "Preauth module {str} ({int}) (flags={int}) returned: " \
+ "{kerr}", name, (int) patype, flags, code)
+#define TRACE_PREAUTH_SAM_KEY_GAK(c, keyblock) \
+ TRACE(c, "AS key obtained for SAM: {keyblock}", keyblock)
+#define TRACE_PREAUTH_SALT(c, salt, patype) \
+ TRACE(c, "Received salt \"{data}\" via padata type {int}", salt, \
+ (int) patype)
+#define TRACE_PREAUTH_SKIP(c, name, patype) \
+ TRACE(c, "Skipping previously used preauth module {str} ({int})", \
+ name, (int) patype)
+#define TRACE_PREAUTH_TRYAGAIN_INPUT(c, padata) \
+ TRACE(c, "Preauth tryagain input types: {patypes}", padata)
#define TRACE_PREAUTH_TRYAGAIN_OUTPUT(c, padata) \
- TRACE(c, (c, "Followup preauth for next request: {patypes}", padata))
+ TRACE(c, "Followup preauth for next request: {patypes}", padata)
-#define TRACE_PROFILE_ERR(c,subsection, section, retval) \
- TRACE(c, (c, "Bad value of {str} from [{str}] in conf file: {kerr}", \
- subsection, section, retval))
+#define TRACE_PROFILE_ERR(c,subsection, section, retval) \
+ TRACE(c, "Bad value of {str} from [{str}] in conf file: {kerr}", \
+ subsection, section, retval)
-#define TRACE_RD_REP(c, ctime, cusec, subkey, seqnum) \
- TRACE(c, (c, "Read AP-REP, time {long}.{int}, subkey {keyblock}, " \
- "seqnum {int}", (long) ctime, (int) cusec, subkey, (int) seqnum))
-#define TRACE_RD_REP_DCE(c, ctime, cusec, seqnum) \
- TRACE(c, (c, "Read DCE-style AP-REP, time {long}.{int}, seqnum {int}", \
- (long) ctime, (int) cusec, (int) seqnum))
+#define TRACE_RD_REP(c, ctime, cusec, subkey, seqnum) \
+ TRACE(c, "Read AP-REP, time {long}.{int}, subkey {keyblock}, " \
+ "seqnum {int}", (long) ctime, (int) cusec, subkey, (int) seqnum)
+#define TRACE_RD_REP_DCE(c, ctime, cusec, seqnum) \
+ TRACE(c, "Read DCE-style AP-REP, time {long}.{int}, seqnum {int}", \
+ (long) ctime, (int) cusec, (int) seqnum)
-#define TRACE_RD_REQ_DECRYPT_ANY(c, princ, keyblock) \
- TRACE(c, (c, "Decrypted AP-REQ with server principal {princ}: " \
- "{keyblock}", princ, keyblock))
+#define TRACE_RD_REQ_DECRYPT_ANY(c, princ, keyblock) \
+ TRACE(c, "Decrypted AP-REQ with server principal {princ}: " \
+ "{keyblock}", princ, keyblock)
#define TRACE_RD_REQ_DECRYPT_SPECIFIC(c, princ, keyblock) \
- TRACE(c, (c, "Decrypted AP-REQ with specified server principal {princ}: " \
- "{keyblock}", princ, keyblock))
-#define TRACE_RD_REQ_NEGOTIATED_ETYPE(c, etype) \
- TRACE(c, (c, "Negotiated enctype based on authenticator: {etype}", \
- etype))
+ TRACE(c, "Decrypted AP-REQ with specified server principal {princ}: " \
+ "{keyblock}", princ, keyblock)
+#define TRACE_RD_REQ_NEGOTIATED_ETYPE(c, etype) \
+ TRACE(c, "Negotiated enctype based on authenticator: {etype}", \
+ etype)
#define TRACE_RD_REQ_SUBKEY(c, keyblock) \
- TRACE(c, (c, "Authenticator contains subkey: {keyblock}", keyblock))
+ TRACE(c, "Authenticator contains subkey: {keyblock}", keyblock)
#define TRACE_RD_REQ_TICKET(c, client, server, keyblock) \
- TRACE(c, (c, "AP-REQ ticket: {princ} -> {princ}, session key {keyblock}", \
- client, server, keyblock))
+ TRACE(c, "AP-REQ ticket: {princ} -> {princ}, session key {keyblock}", \
+ client, server, keyblock)
-#define TRACE_SENDTO_KDC(c, len, rlm, master, tcp) \
- TRACE(c, (c, "Sending request ({int} bytes) to {data}{str}{str}", len, \
- rlm, (master) ? " (master)" : "", (tcp) ? " (tcp only)" : ""))
+#define TRACE_SENDTO_KDC(c, len, rlm, master, tcp) \
+ TRACE(c, "Sending request ({int} bytes) to {data}{str}{str}", len, \
+ rlm, (master) ? " (master)" : "", (tcp) ? " (tcp only)" : "")
#define TRACE_SENDTO_KDC_MASTER(c, master) \
- TRACE(c, (c, "Response was{str} from master KDC", (master) ? "" : " not"))
+ TRACE(c, "Response was{str} from master KDC", (master) ? "" : " not")
#define TRACE_SENDTO_KDC_RESOLVING(c, hostname) \
- TRACE(c, (c, "Resolving hostname {str}", hostname))
-#define TRACE_SENDTO_KDC_RESPONSE(c, conn) \
- TRACE(c, (c, "Received answer from {connstate}", conn))
-#define TRACE_SENDTO_KDC_TCP_CONNECT(c, conn) \
- TRACE(c, (c, "Initiating TCP connection to {connstate}", conn))
-#define TRACE_SENDTO_KDC_TCP_DISCONNECT(c, conn) \
- TRACE(c, (c, "Terminating TCP connection to {connstate}", conn))
+ TRACE(c, "Resolving hostname {str}", hostname)
+#define TRACE_SENDTO_KDC_RESPONSE(c, conn) \
+ TRACE(c, "Received answer from {connstate}", conn)
+#define TRACE_SENDTO_KDC_TCP_CONNECT(c, conn) \
+ TRACE(c, "Initiating TCP connection to {connstate}", conn)
+#define TRACE_SENDTO_KDC_TCP_DISCONNECT(c, conn) \
+ TRACE(c, "Terminating TCP connection to {connstate}", conn)
#define TRACE_SENDTO_KDC_TCP_ERROR_CONNECT(c, conn, err) \
- TRACE(c, (c, "TCP error connecting to {connstate}: {errno}", conn, err))
+ TRACE(c, "TCP error connecting to {connstate}: {errno}", conn, err)
#define TRACE_SENDTO_KDC_TCP_ERROR_RECV(c, conn, err) \
- TRACE(c, (c, "TCP error receiving from {connstate}: {errno}", conn, err))
+ TRACE(c, "TCP error receiving from {connstate}: {errno}", conn, err)
#define TRACE_SENDTO_KDC_TCP_ERROR_RECV_LEN(c, conn, err) \
- TRACE(c, (c, "TCP error receiving from {connstate}: {errno}", conn, err))
+ TRACE(c, "TCP error receiving from {connstate}: {errno}", conn, err)
#define TRACE_SENDTO_KDC_TCP_ERROR_SEND(c, conn, err) \
- TRACE(c, (c, "TCP error sending to {connstate}: {errno}", conn, err))
+ TRACE(c, "TCP error sending to {connstate}: {errno}", conn, err)
#define TRACE_SENDTO_KDC_TCP_SEND(c, conn) \
- TRACE(c, (c, "Sending TCP request to {connstate}", conn))
+ TRACE(c, "Sending TCP request to {connstate}", conn)
#define TRACE_SENDTO_KDC_UDP_ERROR_RECV(c, conn, err) \
- TRACE(c, (c, "UDP error receiving from {connstate}: {errno}", conn, err))
+ TRACE(c, "UDP error receiving from {connstate}: {errno}", conn, err)
#define TRACE_SENDTO_KDC_UDP_ERROR_SEND_INITIAL(c, conn, err) \
- TRACE(c, (c, "UDP error sending to {connstate}: {errno}", conn, err))
+ TRACE(c, "UDP error sending to {connstate}: {errno}", conn, err)
#define TRACE_SENDTO_KDC_UDP_ERROR_SEND_RETRY(c, conn, err) \
- TRACE(c, (c, "UDP error sending to {connstate}: {errno}", conn, err))
+ TRACE(c, "UDP error sending to {connstate}: {errno}", conn, err)
#define TRACE_SENDTO_KDC_UDP_SEND_INITIAL(c, conn) \
- TRACE(c, (c, "Sending initial UDP request to {connstate}", conn))
-#define TRACE_SENDTO_KDC_UDP_SEND_RETRY(c, conn) \
- TRACE(c, (c, "Sending retry UDP request to {connstate}", conn))
+ TRACE(c, "Sending initial UDP request to {connstate}", conn)
+#define TRACE_SENDTO_KDC_UDP_SEND_RETRY(c, conn) \
+ TRACE(c, "Sending retry UDP request to {connstate}", conn)
#define TRACE_SEND_TGS_ETYPES(c, etypes) \
- TRACE(c, (c, "etypes requested in TGS request: {etypes}", etypes))
+ TRACE(c, "etypes requested in TGS request: {etypes}", etypes)
#define TRACE_SEND_TGS_SUBKEY(c, keyblock) \
- TRACE(c, (c, "Generated subkey for TGS request: {keyblock}", keyblock))
+ TRACE(c, "Generated subkey for TGS request: {keyblock}", keyblock)
-#define TRACE_TGS_REPLY(c, client, server, keyblock) \
- TRACE(c, (c, "TGS reply is for {princ} -> {princ} with session key " \
- "{keyblock}", client, server, keyblock))
+#define TRACE_TGS_REPLY(c, client, server, keyblock) \
+ TRACE(c, "TGS reply is for {princ} -> {princ} with session key " \
+ "{keyblock}", client, server, keyblock)
#define TRACE_TGS_REPLY_DECODE_SESSION(c, keyblock) \
- TRACE(c, (c, "TGS reply didn't decode with subkey; trying session key " \
- "({keyblock)}", keyblock))
+ TRACE(c, "TGS reply didn't decode with subkey; trying session key " \
+ "({keyblock)}", keyblock)
-#define TRACE_TKT_CREDS(c, creds, cache) \
- TRACE(c, (c, "Getting credentials {creds} using ccache {ccache}", \
- creds, cache))
+#define TRACE_TKT_CREDS(c, creds, cache) \
+ TRACE(c, "Getting credentials {creds} using ccache {ccache}", \
+ creds, cache)
#define TRACE_TKT_CREDS_ADVANCE(c, realm) \
- TRACE(c, (c, "Received TGT for {data}; advancing current realm", realm))
+ TRACE(c, "Received TGT for {data}; advancing current realm", realm)
#define TRACE_TKT_CREDS_CACHED_INTERMEDIATE_TGT(c, tgt) \
- TRACE(c, (c, "Found cached TGT for intermediate realm: {creds}", tgt))
+ TRACE(c, "Found cached TGT for intermediate realm: {creds}", tgt)
#define TRACE_TKT_CREDS_CACHED_SERVICE_TGT(c, tgt) \
- TRACE(c, (c, "Found cached TGT for service realm: {creds}", tgt))
-#define TRACE_TKT_CREDS_CLOSER_REALM(c, realm) \
- TRACE(c, (c, "Trying next closer realm in path: {data}", realm))
+ TRACE(c, "Found cached TGT for service realm: {creds}", tgt)
+#define TRACE_TKT_CREDS_CLOSER_REALM(c, realm) \
+ TRACE(c, "Trying next closer realm in path: {data}", realm)
#define TRACE_TKT_CREDS_COMPLETE(c, princ) \
- TRACE(c, (c, "Received creds for desired service {princ}", princ))
+ TRACE(c, "Received creds for desired service {princ}", princ)
#define TRACE_TKT_CREDS_FALLBACK(c, realm) \
- TRACE(c, (c, "Local realm referral failed; trying fallback realm {data}", \
- realm))
+ TRACE(c, "Local realm referral failed; trying fallback realm {data}", \
+ realm)
#define TRACE_TKT_CREDS_LOCAL_TGT(c, tgt) \
- TRACE(c, (c, "Starting with TGT for client realm: {creds}", tgt))
-#define TRACE_TKT_CREDS_NON_TGT(c, princ) \
- TRACE(c, (c, "Received non-TGT referral response ({princ}); trying " \
- "again without referrals", princ))
-#define TRACE_TKT_CREDS_OFFPATH(c, realm) \
- TRACE(c, (c, "Received TGT for offpath realm {data}", realm))
-#define TRACE_TKT_CREDS_REFERRAL(c, princ) \
- TRACE(c, (c, "Following referral TGT {princ}", princ))
+ TRACE(c, "Starting with TGT for client realm: {creds}", tgt)
+#define TRACE_TKT_CREDS_NON_TGT(c, princ) \
+ TRACE(c, "Received non-TGT referral response ({princ}); trying " \
+ "again without referrals", princ)
+#define TRACE_TKT_CREDS_OFFPATH(c, realm) \
+ TRACE(c, "Received TGT for offpath realm {data}", realm)
+#define TRACE_TKT_CREDS_REFERRAL(c, princ) \
+ TRACE(c, "Following referral TGT {princ}", princ)
#define TRACE_TKT_CREDS_REFERRAL_REALM(c, princ) \
- TRACE(c, (c, "Server has referral realm; starting with {princ}", princ))
+ TRACE(c, "Server has referral realm; starting with {princ}", princ)
#define TRACE_TKT_CREDS_RESPONSE_CODE(c, code) \
- TRACE(c, (c, "TGS request result: {kerr}", code))
+ TRACE(c, "TGS request result: {kerr}", code)
#define TRACE_TKT_CREDS_RETRY_TCP(c) \
- TRACE(c, (c, "Request or response is too big for UDP; retrying with TCP"))
+ TRACE(c, "Request or response is too big for UDP; retrying with TCP")
#define TRACE_TKT_CREDS_SAME_REALM_TGT(c, realm) \
- TRACE(c, (c, "Received TGT referral back to same realm ({data}); trying " \
- "again without referrals", realm))
-#define TRACE_TKT_CREDS_SERVICE_REQ(c, princ, referral) \
- TRACE(c, (c, "Requesting tickets for {princ}, referrals {str}", princ, \
- (referral) ? "on" : "off"))
-#define TRACE_TKT_CREDS_TARGET_TGT(c, princ) \
- TRACE(c, (c, "Received TGT for service realm: {princ}", princ))
-#define TRACE_TKT_CREDS_TARGET_TGT_OFFPATH(c, princ) \
- TRACE(c, (c, "Received TGT for service realm: {princ}", princ))
+ TRACE(c, "Received TGT referral back to same realm ({data}); trying " \
+ "again without referrals", realm)
+#define TRACE_TKT_CREDS_SERVICE_REQ(c, princ, referral) \
+ TRACE(c, "Requesting tickets for {princ}, referrals {str}", princ, \
+ (referral) ? "on" : "off")
+#define TRACE_TKT_CREDS_TARGET_TGT(c, princ) \
+ TRACE(c, "Received TGT for service realm: {princ}", princ)
+#define TRACE_TKT_CREDS_TARGET_TGT_OFFPATH(c, princ) \
+ TRACE(c, "Received TGT for service realm: {princ}", princ)
#define TRACE_TKT_CREDS_TGT_REQ(c, next, cur) \
- TRACE(c, (c, "Requesting TGT {princ} using TGT {princ}", next, cur))
+ TRACE(c, "Requesting TGT {princ} using TGT {princ}", next, cur)
#define TRACE_TKT_CREDS_WRONG_ENCTYPE(c) \
- TRACE(c, (c, "Retrying TGS request with desired service ticket enctypes"))
+ TRACE(c, "Retrying TGS request with desired service ticket enctypes")
#endif /* K5_TRACE_H */
More information about the cvs-krb5
mailing list