---------------------
PatchSet 3365 
Date: 2001/11/22 18:03:48
Author: kinkie
Branch: ntlm
Tag: (none) 
Log:
Fixed.

Members: 
	src/auth/ntlm/helpers/winbind/Makefile.am:1.1.2.1->1.1.2.2 
	src/auth/ntlm/helpers/winbind/wbntlm.h:1.1.2.1->1.1.2.2 

Index: squid/src/auth/ntlm/helpers/winbind/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/helpers/winbind/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/src/auth/ntlm/helpers/winbind/Makefile.am	21 Nov 2001 21:54:31 -0000	1.1.2.1
+++ squid/src/auth/ntlm/helpers/winbind/Makefile.am	22 Nov 2001 18:03:48 -0000	1.1.2.2
@@ -1,11 +1,10 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.1.2.1 2001/11/21 21:54:31 kinkie Exp $
+#  $Id: Makefile.am,v 1.1.2.2 2001/11/22 18:03:48 kinkie Exp $
 #
 
 libexec_PROGRAMS = wb_ntlmauth
-winbindd_ntlmauth_SOURCES = wb_ntlm_auth.c
+wb_ntlmauth_SOURCES = wb_ntlm_auth.c wb_common.c
 INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
     -I$(top_srcdir)/src
-DEFS = -DMYFILE=$@
\ No newline at end of file
Index: squid/src/auth/ntlm/helpers/winbind/wbntlm.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/helpers/winbind/Attic/wbntlm.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/src/auth/ntlm/helpers/winbind/wbntlm.h	21 Nov 2001 21:54:31 -0000	1.1.2.1
+++ squid/src/auth/ntlm/helpers/winbind/wbntlm.h	22 Nov 2001 18:06:09 -0000	1.1.2.2
@@ -41,14 +41,10 @@
 
 /* Debugging stuff */
 
-#ifndef MYFILE
-#define MYFILE __FILE__
-#endif
-					
 #ifdef __GNUC__     /* this is really a gcc-ism */
 static char *__foo;
 #define warn(X...)  fprintf(stderr,"ntlm-auth[%d](%s:%d): ", getpid(), \
-                    ((__foo=strrchr(MYFILE,'/'))==NULL?MYFILE:__foo+1),\
+                    ((__foo=strrchr(__FILE__,'/'))==NULL?__FILE__:__foo+1),\
                     __LINE__);\
                     fprintf(stderr,X)
 #ifdef DEBUG
@@ -76,7 +72,7 @@
 #define SEND(X) debug("sending '%s' to squid\n",X); printf(X "\n");
 #ifdef __GNUC__
 #define SEND2(X,Y...) debug("sending '" X "' to squid\n",Y); \
-                      printf(X "\n",Y);
+                      printf(X "\n",Y)
 #else
 /* no gcc, no debugging. varargs macros are a gcc extension */
 #define SEND2 printf