---------------------
PatchSet 881 
Date: 2000/12/01 00:30:47
Author: rbcollins
Branch: ntlm
Tag: (none) 
Log:
fix to build on *BSD

Members: 
	ntlm_auth_modules/NTLMSSP/Makefile.in:1.1.2.4->1.1.2.5 
	ntlm_auth_modules/NTLMSSP/smbval/Makefile.in:1.1.2.1->1.1.2.2 
	ntlm_auth_modules/NTLMSSP/smbval/smbencrypt.c:1.1.2.1->1.1.2.2 

Index: squid/ntlm_auth_modules/NTLMSSP/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/ntlm_auth_modules/NTLMSSP/Attic/Makefile.in,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- squid/ntlm_auth_modules/NTLMSSP/Makefile.in	30 Nov 2000 17:25:28 -0000	1.1.2.4
+++ squid/ntlm_auth_modules/NTLMSSP/Makefile.in	1 Dec 2000 00:30:47 -0000	1.1.2.5
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.1.2.4 2000/11/30 17:25:28 kinkie Exp $
+#  $Id: Makefile.in,v 1.1.2.5 2000/12/01 00:30:47 rbcollins Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -44,7 +44,7 @@
 $(OBJS): $(top_srcdir)/include/version.h ntlm.h
 
 $(NTLM_AUTH_EXE): $(OBJS) smbval/smbvalid.a 
-	$(CC) $(LDFLAGS) $^ -o $@ $(AUTH_LIBS)
+	$(CC) $(LDFLAGS) $(OBJS) smbval/smbvalid.a -o $@ $(AUTH_LIBS)
 
 smbval/smbvalid.a: smbval/stamp
 
Index: squid/ntlm_auth_modules/NTLMSSP/smbval/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/ntlm_auth_modules/NTLMSSP/smbval/Attic/Makefile.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/ntlm_auth_modules/NTLMSSP/smbval/Makefile.in	3 Aug 2000 12:46:24 -0000	1.1.2.1
+++ squid/ntlm_auth_modules/NTLMSSP/smbval/Makefile.in	1 Dec 2000 00:30:47 -0000	1.1.2.2
@@ -19,30 +19,32 @@
 LDFLAGS         = @LDFLAGS@
 XTRA_LIBS       = @XTRA_LIBS@
 RM              = @RM@
-AR		= @AR@
+AR_R		= @AR_R@
 
 CFLAGS		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 # CFLAGS = -fpic -g
 
 INCLUDES = smblib.h smblib-priv.h
 
-RFCNB = session.o rfcnb-util.o rfcnb-io.o
+#RFCNB = session.o rfcnb-util.o rfcnb-io.o
 
-OBJS = smblib.o smblib-util.o file.o smb-errors.o exper.o smblib-api.o smbencrypt.o smbdes.o md4.o
+#OBJS = smblib.o smblib-util.o file.o smb-errors.o exper.o smblib-api.o smbencrypt.o smbdes.o md4.o
 
 VALIDATE = valid.o session.o rfcnb-util.o \
            rfcnb-io.o smblib-util.o smblib.o smbencrypt.o smbdes.o md4.o
 
-.SUFFIXES: .c .o .h
+#.SUFFIXES: .c .o .h
 
 dummy: all
 
 smbvalid.a:	$(VALIDATE) 
-	$(AR) rcs smbvalid.a $(VALIDATE)
+	$(RM) -f $@
+	$(AR_R) $@ $(VALIDATE)
+	$(RANLIB) $@
 
 all: smbvalid.a
 
-.c.o:	$(INCLUDES)
+#.c.o:	$(INCLUDES)
 
 clean:
 	$(RM) -f *.o smbvalid.a *~
Index: squid/ntlm_auth_modules/NTLMSSP/smbval/smbencrypt.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/ntlm_auth_modules/NTLMSSP/smbval/Attic/smbencrypt.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/ntlm_auth_modules/NTLMSSP/smbval/smbencrypt.c	3 Aug 2000 12:46:25 -0000	1.1.2.1
+++ squid/ntlm_auth_modules/NTLMSSP/smbval/smbencrypt.c	1 Dec 2000 00:30:47 -0000	1.1.2.2
@@ -21,11 +21,12 @@
 */
 
 #include <string.h>
-#include <arpa/inet.h>
+//#include <arpa/inet.h>
 #include <dirent.h>
 #include <string.h>
-#include <sys/vfs.h>
+//#include <sys/vfs.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include "smblib-priv.h"
 #define uchar unsigned char