conditionalize logging code; remove redundant SFILE defs, and error code hacks

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/raeburn-gssapi-cfx@15892 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 7f347a4d9921f08664420da0827a4a9857c14b91..015caffb92b90c4db144aec60b0851c177982d99 100644 (file)
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -243,13 +243,18 @@ OM_uint32 generic_gss_str_to_oid
            gss_OID *           /* oid */
           );
 
+#ifdef EXCESSIVE_LOGGING
 #define _log           gssint_log
 #define _log_block     gssint_log_block
 extern void _log(const char *, ...);
 extern void _log_block(const char *, int, const char *, void *, size_t);
 #define _log_block2(LABEL,PTR,SIZE) _log_block(__FILE__,__LINE__,LABEL,PTR,SIZE)
 #define SFILE (strrchr(__FILE__,'/') ? 1+strrchr(__FILE__,'/') : __FILE__)
-#undef GSS_S_DEFECTIVE_TOKEN
-#define GSS_S_DEFECTIVE_TOKEN (defective(SFILE,__LINE__),(((OM_uint32) 9ul) << GSS_C_ROUTINE_ERROR_OFFSET))
+#else
+#define _log                   (void)
+#define _log_block(A,B,C,D,E)  (void)(A,B,C,D,E)
+#define _log_block2(A,B,C)     (void)(A,B,C)
+#define SFILE                  __FILE__
+#endif
 
 #endif /* _GSSAPIP_GENERIC_H_ */

diff --git a/src/lib/gssapi/generic/util_ordering.c b/src/lib/gssapi/generic/util_ordering.c
index 7810f0f01f458eee6981282574749f13afc36223..610c709c7cdd63f715cf9ca77310959f138c1427 100644 (file)
--- a/src/lib/gssapi/generic/util_ordering.c
+++ b/src/lib/gssapi/generic/util_ordering.c
@@ -242,11 +242,13 @@ g_queue_internalize(void **vqueue, unsigned char **buf, size_t *lenremain)
 
 /* debugging */
 
+#ifdef EXCESSIVE_LOGGING
 #include <stdio.h>
 #include <stdarg.h>
 #include <time.h>
 #define LOGPATH "/tmp/gsslog"
-void _log(const char *fmt, ...) {
+void _log(const char *fmt, ...)
+{
 #if 0
     static FILE *logf;
     va_list x;
@@ -281,8 +283,4 @@ void _log(const char *fmt, ...) {
     va_end(x);
 #endif
 }
-
-int defective(const char *f,int l) {
-    _log("%s:%d: reporting defective token\n", f, l);
-    return -1;
-}
+#endif

diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c
index 925044a47e834eec4fb5e8bf34e5a28903bd1d50..d1c45277ac7a0ee952c543c21256f4ef42bd70ea 100644 (file)
--- a/src/lib/gssapi/generic/util_token.c
+++ b/src/lib/gssapi/generic/util_token.c
@@ -168,12 +168,6 @@ void g_make_token_header(mech, body_size, buf, tok_type)
  * mechanism in the token does not match the mech argument.  buf and
  * *body_size are left unmodified on error.
  */
-static gss_int32 g_bad_tok_header = G_BAD_TOK_HEADER;
-#undef G_BAD_TOK_HEADER
-#define G_BAD_TOK_HEADER (_log("%s:%d: returning G_BAD_TOK_HEADER\n", SFILE, __LINE__), g_bad_tok_header)
-static gss_int32 g_wrong_mech = G_WRONG_MECH;
-#undef G_WRONG_MECH
-#define G_WRONG_MECH (_log("%s:%d: returning G_WRONG_MECH\n", SFILE, __LINE__), g_wrong_mech)
 
 gss_int32 g_verify_token_header(mech, body_size, buf_in, tok_type, toksize_in,
                                wrapper_required)
@@ -189,7 +183,6 @@ gss_int32 g_verify_token_header(mech, body_size, buf_in, tok_type, toksize_in,
    gss_OID_desc toid;
    int toksize = toksize_in;
 
-#define SFILE (strrchr(__FILE__,'/') ? 1+strrchr(__FILE__,'/') : __FILE__)
    _log("%s:%d: %s(tok_type=0x%x, toksize=%d, wrapper_required=%d)\n",
        SFILE, __LINE__, __func__, tok_type, toksize, wrapper_required);
    _log_block2("input token", buf, toksize);