Skip to content

Commit

Permalink
Use a proper consumer interface for clpreauth
Browse files Browse the repository at this point in the history
In preauth2.c, use wrapper functions for calls to clpreauth functions.
Get rid of the expanded-out module table, instead using a helper
function to find the handle for a preauth type.  Replace use counts
with a list of previously processed pa types.  Check for pa type
conflicts when loading clpreauth modules.
  • Loading branch information
greghudson committed Dec 19, 2012
1 parent f0794cb commit 5c23bce
Show file tree
Hide file tree
Showing 2 changed files with 365 additions and 422 deletions.
9 changes: 6 additions & 3 deletions src/include/k5-trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@ void krb5int_trace(krb5_context context, const char *fmt, ...);
#define TRACE_MSPAC_DISCARD_UNVERF(c) \
TRACE(c, "Filtering out unverified MS PAC")

#define TRACE_PREAUTH_CONFLICT(c, name1, name2, patype) \
TRACE(c, "Preauth module {str} conflicts with module {str} for pa " \
"type {int}", name1, name2, (int) patype)
#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) \
Expand All @@ -252,9 +255,9 @@ void krb5int_trace(krb5_context context, const char *fmt, ...);
TRACE(c, "Processing preauth types: {patypes}", padata)
#define TRACE_PREAUTH_OUTPUT(c, 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_PROCESS(c, name, patype, real, code) \
TRACE(c, "Preauth module {str} ({int}) ({str}) returned: " \
"{kerr}", name, (int) patype, real ? "real" : "info", 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) \
Expand Down

0 comments on commit 5c23bce

Please sign in to comment.