From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 18 Apr 2006 23:06:47 +0000 (+0000)
Subject: (krb5int_debug_fprint): Use strerror_r if available.
X-Git-Tag: krb5-1.5-alpha1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d439ef0834c1c73d94b95fb785e7132ffb3af8b;p=thirdparty%2Fkrb5.git

(krb5int_debug_fprint): Use strerror_r if available.
(bogus_strerror): Unused function deleted.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17939 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index 23e99d51c9..75cb036785 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -110,7 +110,10 @@ krb5int_debug_fprint (const char *fmt, ...)
     const krb5_data *d;
     char addrbuf[NI_MAXHOST], portbuf[NI_MAXSERV];
     const char *p;
-    char tmpbuf[NI_MAXHOST + NI_MAXSERV + 30];
+#ifndef max
+#define max(a,b) ((a) > (b) ? (a) : (b))
+#endif
+    char tmpbuf[max(NI_MAXHOST + NI_MAXSERV + 30, 200)];
 
     if (!krb5int_debug_sendto_kdc)
 	return;
@@ -146,7 +149,13 @@ krb5int_debug_fprint (const char *fmt, ...)
 	       rather than the current value.  */
 	    err = va_arg(args, int);
 	    putf("%d/", err);
-	    p = strerror(err);
+	    p = NULL;
+#ifdef HAVE_STRERROR_R
+	    if (strerror_r(err, tmpbuf, sizeof(tmpbuf)) == 0)
+		p = tmpbuf;
+#endif
+	    if (p == NULL)
+		p = strerror(err);
 	    putstr(p);
 	    break;
 	case 'F':
@@ -398,16 +407,6 @@ krb5_sendto_kdc (krb5_context context, const krb5_data *message,
     return retval;
 }
 
-#if defined(_WIN32) && defined(DEBUG)
-static char *bogus_strerror (int xerr)
-{
-    static char buf[30];
-    sprintf(buf, "[err%d]", xerr);
-    return buf;
-}
-#define strerror(S) bogus_strerror(S)
-#endif
-
 #ifdef DEBUG
 
 #ifdef _WIN32