Bootstrapped

diff --git a/Makefile.in b/Makefile.in
index 4b51264f4e93b2e74d74dc91eff7496c8b051d09..4dc647d388cd7fc3c4e58c244706a2c225f8f5a4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.42 2003/02/06 09:59:47 robertc Exp $
+# $Id: Makefile.in,v 1.43 2003/02/12 01:10:52 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -101,6 +101,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
@@ -467,7 +468,7 @@ uninstall-info: uninstall-info-recursive
 
 
 dist-hook:
-       @ for subdir in "include"; do \
+       @ for subdir in "include include/samba/nsswitch"; do \
          if test "$$subdir" = .; then :; else \
            test -d $(distdir)/$$subdir \
            || mkdir $(distdir)/$$subdir \

diff --git a/configure b/configure
index 5bb86d2bd55de2c3bcda396d468ff1ec1a2d2bf9..18ba0c6cd9790bde184cf895f25f8546b3a6c4f9 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.320 .
+# From configure.in Revision: 1.321 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -1014,6 +1014,11 @@ Optional Packages:
                          installation can be specified if outside of the
                          system standard directories
   --with-coss-membuf-size COSS membuf size (default 1048576 bytes)
+  --with-samba-sources=/path/to/samba-source-tree
+                          Path where the correct Samba source files can be
+                         found while building winbind helpers. (defaults to
+                         use internal copies of the headers from Samba-2.2.7)
+
   --with-filedescriptors=NUMBER Force squid to support NUMBER filedescriptors
 
 Some influential environment variables:
@@ -5235,6 +5240,23 @@ _ACEOF
 
 fi;
 
+
+SAMBASOURCES='$(top_srcdir)/include/samba'
+
+# Check whether --with-samba-sources or --without-samba-sources was given.
+if test "${with_samba_sources+set}" = set; then
+  withval="$with_samba_sources"
+   if test -f $withval/source/nsswitch/winbind_nss_config.h; then
+       echo "Using Samba sources from $withval"
+       SAMBASOURCES="$withval/source"
+    else
+       echo "ERROR: Cannot find Samba sources at $withval"
+       exit 1
+    fi
+
+fi;
+
+
 # Check whether --enable-unlinkd or --disable-unlinkd was given.
 if test "${enable_unlinkd+set}" = set; then
   enableval="$enable_unlinkd"
@@ -16568,6 +16590,7 @@ s,@BASIC_AUTH_HELPERS@,$BASIC_AUTH_HELPERS,;t t
 s,@NTLM_AUTH_HELPERS@,$NTLM_AUTH_HELPERS,;t t
 s,@DIGEST_AUTH_HELPERS@,$DIGEST_AUTH_HELPERS,;t t
 s,@EXTERNAL_ACL_HELPERS@,$EXTERNAL_ACL_HELPERS,;t t
+s,@SAMBASOURCES@,$SAMBASOURCES,;t t
 s,@ENABLE_UNLINKD_TRUE@,$ENABLE_UNLINKD_TRUE,;t t
 s,@ENABLE_UNLINKD_FALSE@,$ENABLE_UNLINKD_FALSE,;t t
 s,@ENABLE_XPROF_STATS_TRUE@,$ENABLE_XPROF_STATS_TRUE,;t t

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index cddf2503bfc183792193ec960fe4cf514523f904..4bc946b3d03b9026b729774a6a24fd8e0906c9e2 100644 (file)
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/doc/Makefile.in b/doc/Makefile.in
index b09761acce8a3c5689eb9614c0bf5fa385be4dcb..6c12edfdeb4eedbd6807bbb74ce1190aa31c23a3 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.24 2003/02/06 09:59:51 robertc Exp $
+#  $Id: Makefile.in,v 1.25 2003/02/12 01:10:55 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/errors/Makefile.in b/errors/Makefile.in
index 9b9f0a198052911dd28c841be213615e05eaa7ef..2104816b5da91d5a9854791851cd2ff5a3515c4f 100644 (file)
--- a/errors/Makefile.in
+++ b/errors/Makefile.in
@@ -14,7 +14,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.40 2003/02/06 09:59:52 robertc Exp $
+# $Id: Makefile.in,v 1.41 2003/02/12 01:10:59 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -101,6 +101,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/Makefile.in b/helpers/Makefile.in
index 29ef88b1329d57d10bff0d653353b3d77ac26f88..35c98263e8f6a8c8f685027940cf84d59816f6d7 100644 (file)
--- a/helpers/Makefile.in
+++ b/helpers/Makefile.in
@@ -97,6 +97,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/LDAP/Makefile.in b/helpers/basic_auth/LDAP/Makefile.in
index ce60b56af0d8a049bbdd474adcf503dfbb88ea24..eda8764afb580d8ef0708d3de78f6c56bf913037 100644 (file)
--- a/helpers/basic_auth/LDAP/Makefile.in
+++ b/helpers/basic_auth/LDAP/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.in,v 1.33 2003/02/06 09:59:58 robertc Exp $
+#  $Id: Makefile.in,v 1.34 2003/02/12 01:11:19 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/MSNT/Makefile.in b/helpers/basic_auth/MSNT/Makefile.in
index 81d612cc1787b464f2d5fba6c59ffe05a55e32c6..87300f182d3e1cb9cf819246eb2fc7029b20e6a9 100644 (file)
--- a/helpers/basic_auth/MSNT/Makefile.in
+++ b/helpers/basic_auth/MSNT/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.36 2003/02/06 09:59:58 robertc Exp $
+#  $Id: Makefile.in,v 1.37 2003/02/12 01:11:36 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/Makefile.in b/helpers/basic_auth/Makefile.in
index 6877a49ffd60f4700be7efa40457b317af7a147c..5331a17bf60a86a3a604b3dd75ca70bb50be5549 100644 (file)
--- a/helpers/basic_auth/Makefile.in
+++ b/helpers/basic_auth/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.31 2003/02/06 09:59:57 robertc Exp $
+#  $Id: Makefile.in,v 1.32 2003/02/12 01:11:13 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/NCSA/Makefile.in b/helpers/basic_auth/NCSA/Makefile.in
index ae9c1d6adecf91afcef7af5c6edb4a51ac072812..29265425357558fea37eb3375df2a30d14f93bd8 100644 (file)
--- a/helpers/basic_auth/NCSA/Makefile.in
+++ b/helpers/basic_auth/NCSA/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.31 2003/02/06 09:59:59 robertc Exp $
+#  $Id: Makefile.in,v 1.32 2003/02/12 01:11:41 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/PAM/Makefile.in b/helpers/basic_auth/PAM/Makefile.in
index e90209e3f43f8b916538acfd91b4224356be1ecb..6713da392d0bb659a555ce449d24544d86cad41b 100644 (file)
--- a/helpers/basic_auth/PAM/Makefile.in
+++ b/helpers/basic_auth/PAM/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid PAM authentication helper
 #
-#  $Id: Makefile.in,v 1.32 2003/02/06 10:00:04 robertc Exp $
+#  $Id: Makefile.in,v 1.33 2003/02/12 01:11:42 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/SASL/Makefile.in b/helpers/basic_auth/SASL/Makefile.in
index d979b65727f60eee8cec7752259b50c655a5528c..cd6d63c80fdfe85d01c240b8f9698b2209fbef73 100644 (file)
--- a/helpers/basic_auth/SASL/Makefile.in
+++ b/helpers/basic_auth/SASL/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid SASL authentication helper
 #
-#  $Id: Makefile.in,v 1.29 2003/02/06 10:00:04 robertc Exp $
+#  $Id: Makefile.in,v 1.30 2003/02/12 01:11:46 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/SMB/Makefile.in b/helpers/basic_auth/SMB/Makefile.in
index 9d500995d1f10b81fe14353cc8743da47186f3c1..3bd6a0acc0102ccb0ca96801174f30a5eef2bd2c 100644 (file)
--- a/helpers/basic_auth/SMB/Makefile.in
+++ b/helpers/basic_auth/SMB/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.32 2003/02/06 10:00:07 robertc Exp $
+#  $Id: Makefile.in,v 1.33 2003/02/12 01:11:48 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -110,6 +110,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/YP/Makefile.in b/helpers/basic_auth/YP/Makefile.in
index f848430ca52d11df3ddfe914c561f75198471270..8ce7652667f1b4b41fe4fffeacb555739f547894 100644 (file)
--- a/helpers/basic_auth/YP/Makefile.in
+++ b/helpers/basic_auth/YP/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.33 2003/02/06 10:00:09 robertc Exp $
+#  $Id: Makefile.in,v 1.34 2003/02/12 01:11:51 hno Exp $
 #
 #
 
@@ -104,6 +104,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/getpwnam/Makefile.in b/helpers/basic_auth/getpwnam/Makefile.in
index 131384c56efd5aa2d093c5d9d765ce209a3439f9..16803047a262d4b45404b1a3d5a3d6a6d9144fb7 100644 (file)
--- a/helpers/basic_auth/getpwnam/Makefile.in
+++ b/helpers/basic_auth/getpwnam/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.31 2003/02/06 10:00:09 robertc Exp $
+#  $Id: Makefile.in,v 1.32 2003/02/12 01:11:54 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/multi-domain-NTLM/Makefile.in b/helpers/basic_auth/multi-domain-NTLM/Makefile.in
index 947b9ce4708af16c9ffc0bdabcf0234d69d06fbe..2e4de5f36f37f35da15702fe6bc7bf264527c407 100644 (file)
--- a/helpers/basic_auth/multi-domain-NTLM/Makefile.in
+++ b/helpers/basic_auth/multi-domain-NTLM/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.29 2003/02/06 10:00:10 robertc Exp $
+#  $Id: Makefile.in,v 1.30 2003/02/12 01:11:56 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/basic_auth/winbind/Makefile.in b/helpers/basic_auth/winbind/Makefile.in
index 8758dd52cf0ea07b02a504fbb484ae06d2082a3a..c6360dc4238557ef651e58cc6e8e4b324c1ddc54 100644 (file)
--- a/helpers/basic_auth/winbind/Makefile.in
+++ b/helpers/basic_auth/winbind/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.23 2003/02/06 10:00:14 robertc Exp $
+#  $Id: Makefile.in,v 1.24 2003/02/12 01:11:59 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -103,6 +103,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
@@ -121,8 +122,8 @@ install_sh = @install_sh@
 makesnmplib = @makesnmplib@
 
 libexec_PROGRAMS = wb_auth
-wb_auth_SOURCES = wb_basic_auth.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h
-INCLUDES = -I$(top_srcdir)/include
+wb_auth_SOURCES = wb_basic_auth.c wb_common.c wbntlm.h
+INCLUDES = -I$(top_srcdir)/include -I@SAMBASOURCES@
 LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS)
 subdir = helpers/basic_auth/winbind
 mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs

diff --git a/helpers/digest_auth/Makefile.in b/helpers/digest_auth/Makefile.in
index 9e425a26a57d3e3e0920edba9e2312eb12e2506b..58f0a8e92c000017387e3e9655c56369937df3fd 100644 (file)
--- a/helpers/digest_auth/Makefile.in
+++ b/helpers/digest_auth/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for digest auth helpers in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.28 2003/02/06 10:00:14 robertc Exp $
+#  $Id: Makefile.in,v 1.29 2003/02/12 01:12:02 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in
index 47c56f39f7d80d26c23b388c8a6e7f05e54248fb..dd9ef5fa80348cd9f5ca2fddeb6f7459885be084 100644 (file)
--- a/helpers/digest_auth/password/Makefile.in
+++ b/helpers/digest_auth/password/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.30 2003/02/06 10:00:15 robertc Exp $
+#  $Id: Makefile.in,v 1.31 2003/02/12 01:12:03 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/external_acl/Makefile.in b/helpers/external_acl/Makefile.in
index 4b7e1e21458189fabdbd1b26587112dd59c6ad61..912ba2200207e6d7ba93368c4e7d27e693779fd1 100644 (file)
--- a/helpers/external_acl/Makefile.in
+++ b/helpers/external_acl/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.18 2003/02/06 10:00:16 robertc Exp $
+#  $Id: Makefile.in,v 1.19 2003/02/12 01:12:08 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/external_acl/ip_user/Makefile.in b/helpers/external_acl/ip_user/Makefile.in
index 98a78094d14ce25b2faa6c9ef866f21655335365..57c43f36b59b973d9960c12db02cbf35b1e5537e 100644 (file)
--- a/helpers/external_acl/ip_user/Makefile.in
+++ b/helpers/external_acl/ip_user/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the ip_user external_acl helper by Rodrigo Campos
 #
-#  $Id: Makefile.in,v 1.18 2003/02/06 10:00:16 robertc Exp $
+#  $Id: Makefile.in,v 1.19 2003/02/12 01:12:08 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/external_acl/ldap_group/Makefile.in b/helpers/external_acl/ldap_group/Makefile.in
index c944d4687cd4ef1301ffc860a9418dc2cea49692..190e7f99fc308b51bb68d8bb325269d8e92446e2 100644 (file)
--- a/helpers/external_acl/ldap_group/Makefile.in
+++ b/helpers/external_acl/ldap_group/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.in,v 1.19 2003/02/06 10:00:16 robertc Exp $
+#  $Id: Makefile.in,v 1.20 2003/02/12 01:12:15 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/external_acl/unix_group/Makefile.in b/helpers/external_acl/unix_group/Makefile.in
index c022ae584888f6151ffe787a92064b9b5cbbe52c..f2c6e06c965355e79c66990dafba4f20a688a2da 100644 (file)
--- a/helpers/external_acl/unix_group/Makefile.in
+++ b/helpers/external_acl/unix_group/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.in,v 1.18 2003/02/06 10:00:17 robertc Exp $
+#  $Id: Makefile.in,v 1.19 2003/02/12 01:12:15 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/external_acl/wbinfo_group/Makefile.in b/helpers/external_acl/wbinfo_group/Makefile.in
index c4bdf4e1cb770f5e5566efe38c05f0b9adfb355f..1093863920da4ded4f956e02322cf82585ae370f 100644 (file)
--- a/helpers/external_acl/wbinfo_group/Makefile.in
+++ b/helpers/external_acl/wbinfo_group/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid LDAP authentication helper
 #
-#  $Id: Makefile.in,v 1.17 2003/02/06 10:00:17 robertc Exp $
+#  $Id: Makefile.in,v 1.18 2003/02/12 01:12:17 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/external_acl/winbind_group/Makefile.in b/helpers/external_acl/winbind_group/Makefile.in
index ed17f54bfc2e4d49a5e1c2fa73331439c1157d27..399f15cabf4c2187bcaac8675930fac72a0ae753 100644 (file)
--- a/helpers/external_acl/winbind_group/Makefile.in
+++ b/helpers/external_acl/winbind_group/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the wb_group external_acl helper
 #
-#  $Id: Makefile.in,v 1.18 2003/02/06 10:00:19 robertc Exp $
+#  $Id: Makefile.in,v 1.19 2003/02/12 01:12:22 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -103,6 +103,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
@@ -121,10 +122,10 @@ install_sh = @install_sh@
 makesnmplib = @makesnmplib@
 
 libexec_PROGRAMS = wb_group
-wb_group_SOURCES = wb_check_group.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h
+wb_group_SOURCES = wb_check_group.c wb_common.c wbntlm.h
 EXTRA_DIST = readme.txt
 INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
-    -I$(top_srcdir)/src
+    -I$(top_srcdir)/src -I@SAMBASOURCES@
 
 LDADD = -L$(top_builddir)/lib $(XTRA_LIBS)
 subdir = helpers/external_acl/winbind_group

diff --git a/helpers/ntlm_auth/Makefile.in b/helpers/ntlm_auth/Makefile.in
index 1661a23d0ee93972632eb37b7f37fb092867e749..4123c1bae9ebc273f9f1a5c15c48595743420336 100644 (file)
--- a/helpers/ntlm_auth/Makefile.in
+++ b/helpers/ntlm_auth/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.31 2003/02/06 10:00:21 robertc Exp $
+#  $Id: Makefile.in,v 1.32 2003/02/12 01:12:24 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/ntlm_auth/SMB/Makefile.in b/helpers/ntlm_auth/SMB/Makefile.in
index c9725fc72a4c1132aadf5ca3328be7d62d732240..54450c7ddc57b4b73df48a461a6efc50fa1b4742 100644 (file)
--- a/helpers/ntlm_auth/SMB/Makefile.in
+++ b/helpers/ntlm_auth/SMB/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.31 2003/02/06 10:00:21 robertc Exp $
+#  $Id: Makefile.in,v 1.32 2003/02/12 01:12:26 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -103,6 +103,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/ntlm_auth/SMB/smbval/Makefile.in b/helpers/ntlm_auth/SMB/smbval/Makefile.in
index d8cdd3731964f9a691bee64c2c5470a9dd8039e5..6fbc65da33299ef89f1753bc0185a8ffa7b9d64d 100644 (file)
--- a/helpers/ntlm_auth/SMB/smbval/Makefile.in
+++ b/helpers/ntlm_auth/SMB/smbval/Makefile.in
@@ -99,6 +99,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/ntlm_auth/fakeauth/Makefile.in b/helpers/ntlm_auth/fakeauth/Makefile.in
index be25cc5d7776d1645c68314d960001594032f4df..94c0e2267fd9cc05d087e12256bc5d6299927ae5 100644 (file)
--- a/helpers/ntlm_auth/fakeauth/Makefile.in
+++ b/helpers/ntlm_auth/fakeauth/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.30 2003/02/06 10:00:23 robertc Exp $
+#  $Id: Makefile.in,v 1.31 2003/02/12 01:12:31 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/ntlm_auth/no_check/Makefile.in b/helpers/ntlm_auth/no_check/Makefile.in
index e159cc4488107f993f4d1b952bc42754687340b4..45116168585abea8e3be6f8f62428de8e0c3c145 100644 (file)
--- a/helpers/ntlm_auth/no_check/Makefile.in
+++ b/helpers/ntlm_auth/no_check/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.32 2003/02/06 10:00:23 robertc Exp $
+#  $Id: Makefile.in,v 1.33 2003/02/12 01:12:34 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/helpers/ntlm_auth/winbind/Makefile.in b/helpers/ntlm_auth/winbind/Makefile.in
index 1f8c21671277baf2c533fef708fb7fa821efc31d..ea2ae0b9c9396d3f68ee454699e082aa198741a2 100644 (file)
--- a/helpers/ntlm_auth/winbind/Makefile.in
+++ b/helpers/ntlm_auth/winbind/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.23 2003/02/06 10:00:25 robertc Exp $
+#  $Id: Makefile.in,v 1.24 2003/02/12 01:12:37 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -103,6 +103,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@
@@ -121,13 +122,13 @@ install_sh = @install_sh@
 makesnmplib = @makesnmplib@
 
 libexec_PROGRAMS = wb_ntlmauth
-wb_ntlmauth_SOURCES = wb_ntlm_auth.c wb_common.c samba_nss.h winbindd_nss.h wbntlm.h winbind_nss_config.h
+wb_ntlmauth_SOURCES = wb_ntlm_auth.c wb_common.c wbntlm.h
 EXTRA_DIST = \
        patches/wb_common.patch \
        patches/winbind_nss_config.patch
 
 INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
-    -I$(top_srcdir)/src
+    -I$(top_srcdir)/src -I@SAMBASOURCES@
 
 LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS)
 subdir = helpers/ntlm_auth/winbind

diff --git a/icons/Makefile.in b/icons/Makefile.in
index 58dc63568df74252ce777439bd6298792a0d56c6..3641c4e6abf5072ce4c71bbeda02e8c43ba8f309 100644 (file)
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -13,7 +13,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.42 2003/02/06 10:00:26 robertc Exp $
+# $Id: Makefile.in,v 1.43 2003/02/12 01:12:39 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -100,6 +100,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 22ff3cd8ffd710a597488cf50b75147101041505..9600ac6c62c955444c05001fa3e1ab4d3c32d9ef 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -14,7 +14,7 @@
 @SET_MAKE@
 
 #
-#  $Id: Makefile.in,v 1.79 2003/02/06 10:00:26 robertc Exp $
+#  $Id: Makefile.in,v 1.80 2003/02/12 01:12:42 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -101,6 +101,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index c7dc08c5b83d1cf44209d453fbfdb74dffc38971..067fec276b921f051ce542a58997b39dd24bb90c 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in
index f9cfda5d105d304025210d8679b0cadea7b5afb7..ba399d145637ec46523d7e9931ecd6fa53d64250 100644 (file)
--- a/snmplib/Makefile.in
+++ b/snmplib/Makefile.in
@@ -97,6 +97,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/src/Makefile.in b/src/Makefile.in
index 66c918081d46ae7a8d0f4692d918cab1882ad8bd..fb9c595b16c8bdd2ae290ebd18283613f13d1e7d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.282 2003/02/11 13:07:27 hno Exp $
+#  $Id: Makefile.in,v 1.283 2003/02/12 01:12:52 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -105,6 +105,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index f2f5c114ace28913f9da60c7a2609850621db895..24fc140830cecb849b88cf173538960ddb629a78 100644 (file)
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for authentication modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.30 2003/02/06 10:00:31 robertc Exp $
+#  $Id: Makefile.in,v 1.31 2003/02/12 01:12:53 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in
index d3ca6459da0258e8abc3e9156f672cef57eb8e0a..6a6ca266d35238b12ac5368e9c279ed9ec6eb082 100644 (file)
--- a/src/fs/Makefile.in
+++ b/src/fs/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.33 2003/02/06 10:00:31 robertc Exp $
+#  $Id: Makefile.in,v 1.34 2003/02/12 01:12:55 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/src/repl/Makefile.in b/src/repl/Makefile.in
index c55efaa4b9358ff731c2d9476304f35d327a5404..787156d9c14920a455ae3b94ec72c5fc24760580 100644 (file)
--- a/src/repl/Makefile.in
+++ b/src/repl/Makefile.in
@@ -15,7 +15,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.30 2003/02/06 10:00:33 robertc Exp $
+#  $Id: Makefile.in,v 1.31 2003/02/12 01:12:58 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -102,6 +102,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@

diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in
index 0607db66f311ba8ae9cf8d2f1cab3918c8e46fe4..baf4b4c3c383573d48e17b07f35810f7e881193e 100644 (file)
--- a/test-suite/Makefile.in
+++ b/test-suite/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.17 2003/02/06 10:00:35 robertc Exp $
+#  $Id: Makefile.in,v 1.18 2003/02/12 01:13:04 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -103,6 +103,7 @@ REPL_LIBS = @REPL_LIBS@
 REPL_OBJS = @REPL_OBJS@
 REPL_POLICIES = @REPL_POLICIES@
 RM = @RM@
+SAMBASOURCES = @SAMBASOURCES@
 SH = @SH@
 SNMPLIB = @SNMPLIB@
 SSLLIB = @SSLLIB@