krb5 commit [krb5-1.11]: Remove broken clean_hostname trace messages

Tom Yu tlyu at MIT.EDU
Mon Nov 26 15:08:19 EST 2012


https://github.com/krb5/krb5/commit/543a2602053c9348dcdbb49c8d2c8581886bb89e
commit 543a2602053c9348dcdbb49c8d2c8581886bb89e
Author: Greg Hudson <ghudson at mit.edu>
Date:   Sun Nov 25 17:53:02 2012 -0500

    Remove broken clean_hostname trace messages
    
    The trace messages in krb5int_clean_hostname were outputting the
    entire contents of the output buffer (mostly uninitialized garbage)
    into the trace log.  Since these messages were essentially redundant
    with messages in the callers, and were arguably at too low of a level
    to begin with, simply remove them.
    
    (cherry picked from commit d5aac5c1a010410e79cce4219e618d9ce27d8621)
    
    ticket: 7459
    version_fixed: 1.11
    status: resolved

 src/include/k5-trace.h      |    7 -------
 src/lib/krb5/os/hst_realm.c |    2 --
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/src/include/k5-trace.h b/src/include/k5-trace.h
index 57d6119..df7159f 100644
--- a/src/include/k5-trace.h
+++ b/src/include/k5-trace.h
@@ -402,13 +402,6 @@ void krb5int_trace(krb5_context context, const char *fmt, ...);
 #define TRACE_GET_FALLBACK_HOST_REALM_RETURN(c, host, realm) \
     TRACE(c, "Got fallback realm {str} for host {str}", realm, host)
 
-#define TRACE_CLEAN_HOSTNAME(c, host, size, localhost) \
-    TRACE(c, "Clean host {str} with local host {lenstr}", \
-          host, size, localhost)
-#define TRACE_CLEAN_HOSTNAME_RETURN(c, host, size, localhost)  \
-    TRACE(c, "Cleaned host {str} to local host {lenstr}", \
-          host, size, localhost)
-
 #define TRACE_SNAME_TO_PRINCIPAL(c, host, sname, type) \
     TRACE(c, "Convert service {str} ({ptype}) on host {str} to principal", \
           sname, type, host)
diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index f5cec66..7bfce5e 100644
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -375,7 +375,6 @@ krb5int_clean_hostname(krb5_context context,
     int l;
 
     local_host[0]=0;
-    TRACE_CLEAN_HOSTNAME(context, host, lhsize, local_host);
     if (host) {
         /* Filter out numeric addresses if the caller utterly failed to
            convert them to names.  */
@@ -418,7 +417,6 @@ krb5int_clean_hostname(krb5_context context,
     if (l && local_host[l-1] == '.')
         local_host[l-1] = 0;
 
-    TRACE_CLEAN_HOSTNAME_RETURN(context, host, lhsize, local_host);
     return 0;
 }
 


More information about the cvs-krb5 mailing list