--------------------- PatchSet 11294 Date: 2007/03/03 18:27:18 Author: hno Branch: SQUID_2_6 Tag: (none) Log: Author: serassio MFC: Cosmetic Fix: use the correct helper name in debug messages Merged changes: 2007/03/03 17:22:04 serassio +10 -10 Cosmetic Fix: use the correct helper name in debug messages Members: helpers/basic_auth/mswin_sspi/valid.h:1.1->1.1.2.1 helpers/negotiate_auth/mswin_sspi/negotiate.h:1.1->1.1.2.1 helpers/ntlm_auth/SMB/ntlm.h:1.8->1.8.2.1 helpers/ntlm_auth/fakeauth/ntlm.h:1.7->1.7.2.1 helpers/ntlm_auth/mswin_sspi/ntlm.h:1.1->1.1.2.1 Index: squid/helpers/basic_auth/mswin_sspi/valid.h =================================================================== RCS file: /cvsroot/squid/squid/helpers/basic_auth/mswin_sspi/valid.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- squid/helpers/basic_auth/mswin_sspi/valid.h 27 May 2006 08:58:28 -0000 1.1 +++ squid/helpers/basic_auth/mswin_sspi/valid.h 3 Mar 2007 18:27:18 -0000 1.1.2.1 @@ -76,7 +76,7 @@ #include static char *__foo; #define debug(X...) if (debug_enabled) { \ - fprintf(stderr,"nt_auth[%d](%s:%d): ", getpid(), \ + fprintf(stderr,"mswin_auth[%d](%s:%d): ", getpid(), \ ((__foo=strrchr(__FILE__,'/'))==NULL?__FILE__:__foo+1),\ __LINE__);\ fprintf(stderr,X); } @@ -93,7 +93,7 @@ va_list args; va_start(args, format); - fprintf(stderr, "nt_auth[%d]: ", getpid()); + fprintf(stderr, "mswin_auth[%d]: ", getpid()); vfprintf(stderr, format, args); va_end(args); } Index: squid/helpers/negotiate_auth/mswin_sspi/negotiate.h =================================================================== RCS file: /cvsroot/squid/squid/helpers/negotiate_auth/mswin_sspi/negotiate.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- squid/helpers/negotiate_auth/mswin_sspi/negotiate.h 27 May 2006 08:58:30 -0000 1.1 +++ squid/helpers/negotiate_auth/mswin_sspi/negotiate.h 3 Mar 2007 18:27:18 -0000 1.1.2.1 @@ -52,7 +52,7 @@ #include static char *__foo; #define debug(X...) if (debug_enabled) { \ - fprintf(stderr,"ntlm-auth[%d](%s:%d): ", getpid(), \ + fprintf(stderr,"mswin_negotiate_auth[%d](%s:%d): ", getpid(), \ ((__foo=strrchr(__FILE__,'/'))==NULL?__FILE__:__foo+1),\ __LINE__);\ fprintf(stderr,X); } @@ -73,7 +73,7 @@ va_list args; va_start(args, format); - fprintf(stderr, "negotiate-auth[%d]: ", getpid()); + fprintf(stderr, "mswin_negotiate_auth[%d]: ", getpid()); vfprintf(stderr, format, args); va_end(args); #if FAIL_DEBUG Index: squid/helpers/ntlm_auth/SMB/ntlm.h =================================================================== RCS file: /cvsroot/squid/squid/helpers/ntlm_auth/SMB/ntlm.h,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- squid/helpers/ntlm_auth/SMB/ntlm.h 17 May 2005 16:56:33 -0000 1.8 +++ squid/helpers/ntlm_auth/SMB/ntlm.h 3 Mar 2007 18:27:19 -0000 1.8.2.1 @@ -53,7 +53,7 @@ static const char *__foo; extern char debug_enabled; #define debug(X...) if (debug_enabled) { \ - fprintf(stderr,"ntlm-auth[%ld](%s:%d): ", (long)getpid(), \ + fprintf(stderr,"ntlm_auth[%ld](%s:%d): ", (long)getpid(), \ ((__foo=strrchr(__FILE__,'/'))==NULL?__FILE__:__foo+1),\ __LINE__);\ fprintf(stderr,X); } Index: squid/helpers/ntlm_auth/fakeauth/ntlm.h =================================================================== RCS file: /cvsroot/squid/squid/helpers/ntlm_auth/fakeauth/ntlm.h,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- squid/helpers/ntlm_auth/fakeauth/ntlm.h 28 Aug 2006 09:19:29 -0000 1.7 +++ squid/helpers/ntlm_auth/fakeauth/ntlm.h 3 Mar 2007 18:27:21 -0000 1.7.2.1 @@ -1,5 +1,5 @@ /* - * $Id: ntlm.h,v 1.7 2006/08/28 09:19:29 serassio Exp $ + * $Id: ntlm.h,v 1.7.2.1 2007/03/03 18:27:21 hno Exp $ * * AUTHOR: Andrew Doran * @@ -121,7 +121,7 @@ #include static const char *__foo; #define debug(X...) if (debug_enabled) { \ - fprintf(stderr,"ntlm-auth[%ld](%s:%d): ", (long)getpid(), \ + fprintf(stderr,"fakeauth_auth[%ld](%s:%d): ", (long)getpid(), \ ((__foo=strrchr(__FILE__,'/'))==NULL?__FILE__:__foo+1),\ __LINE__);\ fprintf(stderr,X); } @@ -142,7 +142,7 @@ va_list args; va_start(args, format); - fprintf(stderr, "ntlm-auth[%ld]: ", (long)getpid()); + fprintf(stderr, "fakeauth_auth[%ld]: ", (long)getpid()); vfprintf(stderr, format, args); va_end(args); #if FAIL_DEBUG Index: squid/helpers/ntlm_auth/mswin_sspi/ntlm.h =================================================================== RCS file: /cvsroot/squid/squid/helpers/ntlm_auth/mswin_sspi/ntlm.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- squid/helpers/ntlm_auth/mswin_sspi/ntlm.h 27 May 2006 08:58:30 -0000 1.1 +++ squid/helpers/ntlm_auth/mswin_sspi/ntlm.h 3 Mar 2007 18:27:22 -0000 1.1.2.1 @@ -52,7 +52,7 @@ #include static char *__foo; #define debug(X...) if (debug_enabled) { \ - fprintf(stderr,"ntlm-auth[%d](%s:%d): ", getpid(), \ + fprintf(stderr,"mswin_ntlm_auth[%d](%s:%d): ", getpid(), \ ((__foo=strrchr(__FILE__,'/'))==NULL?__FILE__:__foo+1),\ __LINE__);\ fprintf(stderr,X); } @@ -73,7 +73,7 @@ va_list args; va_start(args, format); - fprintf(stderr, "ntlm-auth[%d]: ", getpid()); + fprintf(stderr, "mswin_ntlm_auth[%d]: ", getpid()); vfprintf(stderr, format, args); va_end(args); #if FAIL_DEBUG