diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-04-18 23:06:47 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-04-18 23:06:47 +0000 |
| commit | 3d439ef0834c1c73d94b95fb785e7132ffb3af8b (patch) | |
| tree | 051dc447289a5f26ba2651e53e1434f9fd0e5aa3 /src | |
| parent | bac2d535436b066bebe287b93a05b7df1ab99d29 (diff) | |
| download | krb5-3d439ef0834c1c73d94b95fb785e7132ffb3af8b.tar.gz krb5-3d439ef0834c1c73d94b95fb785e7132ffb3af8b.tar.xz krb5-3d439ef0834c1c73d94b95fb785e7132ffb3af8b.zip | |
(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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/os/sendto_kdc.c | 23 |
1 files changed, 11 insertions, 12 deletions
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 |