From: Ben Kaduk Date: Thu, 23 Aug 2012 16:38:57 +0000 (-0400) Subject: Do not emit debug printfs under NODEBUG X-Git-Tag: kfw-4.0-final~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6a17136ac0ed42ddaba73d18b39cd8f3cce0c63;p=thirdparty%2Fkrb5.git Do not emit debug printfs under NODEBUG These printfs spew to the console when command-line utilities such as 'klist' and 'aklog' are run, reducing usability. These printfs can also cause application hangs. On a multiprocessor machine, when PuTTY and the ccapiserver are running on different CPUs, PuTTY appears to deadlock with three concurrent threads inside cci_debug_printf(). (cherry picked from commit 932866ad41edf830123bdfef927f1314f3100be9) ticket: 7342 version_fixed: 1.10.4 status: resolved --- diff --git a/src/ccapi/common/win/cci_os_debugging.c b/src/ccapi/common/win/cci_os_debugging.c index de31c7c397..597ac85605 100644 --- a/src/ccapi/common/win/cci_os_debugging.c +++ b/src/ccapi/common/win/cci_os_debugging.c @@ -32,7 +32,9 @@ /* ------------------------------------------------------------------------ */ void cci_os_debug_vprintf (const char *in_format, va_list in_args) { +#ifdef DEBUG printf ( "%s %ld ", timestamp(), GetCurrentThreadId() ); vprintf ( in_format, in_args ); printf ( "\n" ); +#endif }