--------------------- PatchSet 4406 Date: 2002/06/29 10:42:04 Author: serassio Branch: nt-2_5 Tag: (none) Log: Preparing to merge to PRE8 level Members: port/win32/squid.dsw:1.1.2.14->1.1.2.15 port/win32/update.cmd:1.1.2.8->1.1.2.9 port/win32/squid/.cvsignore:1.1.2.1->1.1.2.2 port/win32/squid/buildcount.dsm:1.1.2.1->1.1.2.2 port/win32/squid/buildver.h:1.1.2.1->1.1.2.2 port/win32/squid/squid.dsp:1.1.2.7->1.1.2.8 port/win32/squid/squid.rc:1.1.2.1->1.1.2.2 port/win32/squid/squid.rc2:1.1.2.1->1.1.2.2 src/auth/ntlm/helpers/NTLMSSP-WIN32/ntlm_auth.c:1.1.2.4->1.1.2.5 Index: squid/port/win32/squid.dsw =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid.dsw,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -u -r1.1.2.14 -r1.1.2.15 --- squid/port/win32/squid.dsw 12 May 2002 17:11:51 -0000 1.1.2.14 +++ squid/port/win32/squid.dsw 29 Jun 2002 10:42:04 -0000 1.1.2.15 @@ -158,6 +158,9 @@ Begin Project Dependency Project_Dep_Name unlinkd End Project Dependency + Begin Project Dependency + Project_Dep_Name win32_check_group + End Project Dependency }}} ############################################################################### @@ -504,6 +507,18 @@ ############################################################################### +Project: "win32_check_group"=".\win32_check_group\win32_check_group.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Global: Package=<5> Index: squid/port/win32/update.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/update.cmd,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- squid/port/win32/update.cmd 5 May 2002 16:47:19 -0000 1.1.2.8 +++ squid/port/win32/update.cmd 29 Jun 2002 10:42:04 -0000 1.1.2.9 @@ -11,6 +11,7 @@ copy %0\..\ntlm_win32_auth\%1\ntlm_win32_auth.exe %2\libexec\ntlm_win32_auth.exe copy %0\..\ldap_auth\%1\ldap_auth.exe %2\libexec\ldap_auth.exe rem copy %0\..\..\contrib\htpasswd\%1\htpasswd.exe %2\htpasswd.exe +copy %0\..\win32_check_group\%1\win32_check_group.exe %2\libexec\win32_check_group.exe copy %0\..\cachemgr\%1\cachemgr.exe %2\libexec\cachemgr.cgi rem copy %0\..\..\contrib\chpasswd\%1\chpasswd.exe %2\cgi-bin\chpasswd.cgi copy %0\..\..\..\src\squid.conf.default %2\etc\squid.conf.default Index: squid/port/win32/squid/.cvsignore =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/.cvsignore,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/squid/.cvsignore 8 Apr 2002 19:18:38 -0000 1.1.2.1 +++ squid/port/win32/squid/.cvsignore 29 Jun 2002 10:42:05 -0000 1.1.2.2 @@ -1,3 +1,4 @@ .cvsignore Debug Release +buildver.h Index: squid/port/win32/squid/buildcount.dsm =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/buildcount.dsm,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/squid/buildcount.dsm 23 Jun 2002 16:08:08 -0000 1.1.2.1 +++ squid/port/win32/squid/buildcount.dsm 29 Jun 2002 10:42:05 -0000 1.1.2.2 @@ -56,6 +56,7 @@ full_path = full_path & "buildver.h" 'Open the VersionNo.h file +on error resume next Documents.Open full_path 'Obtain the TextSelection object Index: squid/port/win32/squid/buildver.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/buildver.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/port/win32/squid/buildver.h 23 Jun 2002 16:08:08 -0000 1.1.2.1 +++ squid/port/win32/squid/buildver.h 29 Jun 2002 10:42:05 -0000 1.1.2.2 @@ -1,4 +1,4 @@ -#define FILEVER 2,5,7,1 -#define PRODUCTVER 2,5,7,1 -#define STRFILEVER "2, 5, 7, 1\0" -#define STRPRODUCTVER "2, 5, 7, 1\0" +#define FILEVER 2,5,7,19 +#define PRODUCTVER 2,5,7,19 +#define STRFILEVER "2, 5, 7, 19\0" +#define STRPRODUCTVER "2, 5, 7, 19\0" Index: squid/port/win32/squid/squid.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/squid.dsp,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- squid/port/win32/squid/squid.dsp 23 Jun 2002 16:08:08 -0000 1.1.2.7 +++ squid/port/win32/squid/squid.dsp 29 Jun 2002 10:42:05 -0000 1.1.2.8 @@ -175,6 +175,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\external_acl.c +# End Source File +# Begin Source File + SOURCE=..\..\..\src\fd.c # End Source File # Begin Source File Index: squid/port/win32/squid/squid.rc =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/squid.rc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/squid/squid.rc 23 Jun 2002 16:08:08 -0000 1.1.2.1 +++ squid/port/win32/squid/squid.rc 29 Jun 2002 10:42:05 -0000 1.1.2.2 @@ -64,50 +64,6 @@ #endif // APSTUDIO_INVOKED -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,7,100 - PRODUCTVERSION 2,5,7,100 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x21L -#else - FILEFLAGS 0x20L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "SQUID Web Proxy Cache - http://www.squid-cache.org/\0" - VALUE "FileDescription", "squid\0" - VALUE "FileVersion", "2, 5, 7, 100\0" - VALUE "InternalName", "SquidNT\0" - VALUE "LegalCopyright", "Copyright © 2002\0" - VALUE "LegalTrademarks", "GNU General Public License\0" - VALUE "OriginalFilename", "squid.exe\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "SQUID Web Proxy Cache for Windows NT/2000\0" - VALUE "ProductVersion", "2, 5, 7, 100\0" - VALUE "SpecialBuild", "PRE\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC #endif // Italian (Italy) resources ///////////////////////////////////////////////////////////////////////////// Index: squid/port/win32/squid/squid.rc2 =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/squid.rc2,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/squid/squid.rc2 23 Jun 2002 16:08:08 -0000 1.1.2.1 +++ squid/port/win32/squid/squid.rc2 29 Jun 2002 10:42:05 -0000 1.1.2.2 @@ -59,9 +59,9 @@ PRODUCTVERSION PRODUCTVER FILEFLAGSMASK 0x3fL #ifdef _DEBUG - FILEFLAGS 0x1L + FILEFLAGS 0x21L #else - FILEFLAGS 0x0L + FILEFLAGS 0x20L #endif FILEOS 0x40004L FILETYPE 0x1L @@ -72,17 +72,17 @@ BLOCK "040904b0" BEGIN VALUE "Comments", "\0" - VALUE "CompanyName", "Serassio Guido\0" + VALUE "CompanyName", "SQUID Web Proxy Cache - http://www.squid-cache.org/\0" VALUE "FileDescription", "squid\0" VALUE "FileVersion", STRFILEVER - VALUE "InternalName", "squid\0" + VALUE "InternalName", "SquidNT\0" VALUE "LegalCopyright", "Copyright © 2002\0" - VALUE "LegalTrademarks", "\0" + VALUE "LegalTrademarks", "GNU General Public License\0" VALUE "OriginalFilename", "squid.exe\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Serassio Guido squid\0" + VALUE "ProductName", "SQUID Web Proxy Cache for Windows NT/2000\0" VALUE "ProductVersion", STRPRODUCTVER - VALUE "SpecialBuild", "\0" + VALUE "SpecialBuild", "PRE\0" END END BLOCK "VarFileInfo" Index: squid/src/auth/ntlm/helpers/NTLMSSP-WIN32/ntlm_auth.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/helpers/NTLMSSP-WIN32/Attic/ntlm_auth.c,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid/src/auth/ntlm/helpers/NTLMSSP-WIN32/ntlm_auth.c 27 Apr 2002 21:15:30 -0000 1.1.2.4 +++ squid/src/auth/ntlm/helpers/NTLMSSP-WIN32/ntlm_auth.c 29 Jun 2002 10:42:05 -0000 1.1.2.5 @@ -1,6 +1,10 @@ /* - * (C) 2002 Guido Serassio + * $Id: ntlm_auth.c,v 1.1.2.5 2002/06/29 10:42:05 serassio Exp $ + * + * This is a helper for NTLM Authentication for Squid Cache + * Copyright (C) 2002 Guido Serassio * Based on previous work of Francesco Chemolli and Robert Collins + * * Distributed freely under the terms of the GNU General Public License, * version 2. See the file COPYING for licensing details *