From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 25 Nov 2012 22:53:02 +0000 (-0500)
Subject: Remove broken clean_hostname trace messages
X-Git-Tag: krb5-1.12-alpha1~466
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5aac5c1a010410e79cce4219e618d9ce27d8621;p=thirdparty%2Fkrb5.git

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.

ticket: 7459 (new)
target_version: 1.11
tags: pullup
---

diff --git a/src/include/k5-trace.h b/src/include/k5-trace.h
index 57d6119e06..df7159fe53 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 f5cec66f12..7bfce5ef9e 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;
 }