This patch is generated from the ntlm branch of auth_rewrite in squid Wed Sep 29 01:24:56 2004 GMT See http://devel.squid-cache.org/ Index: squid/configure.in diff -u squid/configure.in:1.1.1.3.10.17.2.30 squid/configure.in:1.1.1.3.10.41 --- squid/configure.in:1.1.1.3.10.17.2.30 Wed Jun 12 03:50:46 2002 +++ squid/configure.in Wed Jun 12 04:06:18 2002 @@ -9,7 +9,7 @@ dnl AC_INIT(src/main.c) AC_CONFIG_AUX_DIR(cfgaux) -AM_INIT_AUTOMAKE(squid, 2.6-DEVEL) +AM_INIT_AUTOMAKE(Squid, 2.6-ntlm) AM_CONFIG_HEADER(include/autoconf.h) AC_REVISION($Revision$)dnl AC_PREFIX_DEFAULT(/usr/local/squid) Index: squid/src/authenticate.c diff -u squid/src/authenticate.c:1.1.1.3.12.17.2.53 squid/src/authenticate.c:1.1.1.3.12.59 --- squid/src/authenticate.c:1.1.1.3.12.17.2.53 Wed Jun 12 03:50:50 2002 +++ squid/src/authenticate.c Wed Jun 12 04:06:22 2002 @@ -197,9 +197,7 @@ auth_user_request_pool = memPoolCreate("Authenticate Request Data", sizeof(auth_user_request_t)); temp_request = memPoolAlloc(auth_user_request_pool); assert(temp_request != NULL); - temp_request->auth_user = NULL; - temp_request->message = NULL; - temp_request->scheme_data = NULL; + memset(temp_request, '\0', sizeof(auth_user_request_t)); temp_request->references = 0; return temp_request; } Index: squid/src/auth/basic/helpers/winbind/Makefile.am diff -u squid/src/auth/basic/helpers/winbind/Makefile.am:1.4.6.1 squid/src/auth/basic/helpers/winbind/Makefile.am:1.1.2.1 --- squid/src/auth/basic/helpers/winbind/Makefile.am:1.4.6.1 Wed Jun 12 03:50:55 2002 +++ squid/src/auth/basic/helpers/winbind/Makefile.am Thu Jan 3 03:11:04 2002 @@ -5,7 +5,7 @@ # 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 +wb_auth_SOURCES = wb_basic_auth.c wb_common.c INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src -LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) +LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth Index: squid/src/auth/ntlm/helpers/winbind/Makefile.am diff -u squid/src/auth/ntlm/helpers/winbind/Makefile.am:1.4.6.1 squid/src/auth/ntlm/helpers/winbind/Makefile.am:1.1.2.6 --- squid/src/auth/ntlm/helpers/winbind/Makefile.am:1.4.6.1 Wed Jun 12 03:50:57 2002 +++ squid/src/auth/ntlm/helpers/winbind/Makefile.am Thu Feb 28 02:27:07 2002 @@ -5,10 +5,7 @@ # 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 -EXTRA_DIST = \ - patches/wb_common.patch \ - patches/winbind_nss_config.patch +wb_ntlmauth_SOURCES = wb_ntlm_auth.c wb_common.c INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src -LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) +LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth -lm