--------------------- PatchSet 2090 Date: 2005/11/01 20:54:19 Author: serassio Branch: nt Tag: (none) Log: Updated VisualStudio Project for Negotiate support Members: port/win32/Makefile.am:1.2.18.13->1.2.18.14 port/win32/squid.sln:1.1.2.3->1.1.2.4 port/win32/update.cmd:1.2.18.9->1.2.18.10 port/win32/libnegotiate/libnegotiate.vcproj:1.1.2.1->1.1.2.2 port/win32/mswin_negotiate_auth/mswin_negotiate_auth.vcproj:1.1.2.1->1.1.2.2 port/win32/squid/squid.vcproj:1.1.2.6->1.1.2.7 Index: squid3/port/win32/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/Makefile.am,v retrieving revision 1.2.18.13 retrieving revision 1.2.18.14 diff -u -r1.2.18.13 -r1.2.18.14 --- squid3/port/win32/Makefile.am 21 Aug 2005 18:46:49 -0000 1.2.18.13 +++ squid3/port/win32/Makefile.am 1 Nov 2005 20:54:19 -0000 1.2.18.14 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.2.18.13 2005/08/21 18:46:49 serassio Exp $ +# $Id: Makefile.am,v 1.2.18.14 2005/11/01 20:54:19 serassio Exp $ # EXTRA_DIST = \ @@ -39,6 +39,7 @@ libheap/libheap.vcproj \ liblru/liblru.vcproj \ libmiscutil/libmiscutil.vcproj \ + libnegotiate/libnegotiate.vcproj \ libntlm/libntlm.vcproj \ libntlmauth/libntlmauth.vcproj \ libnull/libnull.vcproj \ @@ -48,9 +49,11 @@ libufs/libufs.vcproj \ libWinAIO/libWinAIO.vcproj \ libWinDiskThreads/libWinDiskThreads.vcproj \ + mswin_auth/mswin_auth.vcproj \ + mswin_check_lm_group/mswin_check_lm_group.vcproj \ + mswin_negotiate__auth/mswin_negotiate_auth.vcproj \ + mswin_ntlm__auth/mswin_ntlm_auth.vcproj \ NCSA_auth/NCSA_auth.vcproj \ - nt_auth/nt_auth.vcproj \ - ntlm_win32_auth/ntlm_win32_auth.vcproj \ pinger/pinger.vcproj \ squid/buildcount.dsm \ squid/buildver.h \ @@ -62,5 +65,4 @@ squidclient/squidclient.vcproj \ src/encrypt.c \ src/readdir.c \ - unlinkd/unlinkd.vcproj \ - win32_check_group/win32_check_group.vcproj + unlinkd/unlinkd.vcproj Index: squid3/port/win32/squid.sln =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/squid.sln,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid3/port/win32/squid.sln 22 May 2005 09:16:49 -0000 1.1.2.3 +++ squid3/port/win32/squid.sln 1 Nov 2005 20:54:19 -0000 1.1.2.4 @@ -3,6 +3,7 @@ # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Build", "Build.vcproj", "{C50A62CE-A509-4D92-BB2D-B6AC10F29679}" ProjectSection(ProjectDependencies) = postProject + {E9AE84F6-5932-40EA-9EFF-B9553993258E} = {E9AE84F6-5932-40EA-9EFF-B9553993258E} {FEBC1AD4-8805-490F-86C4-EED32F9D364C} = {FEBC1AD4-8805-490F-86C4-EED32F9D364C} {436115CB-6D55-48CA-9625-484F9DAE7F7E} = {436115CB-6D55-48CA-9625-484F9DAE7F7E} {869AB5B9-DC77-4E83-BA14-1FFC4D03A343} = {869AB5B9-DC77-4E83-BA14-1FFC4D03A343} @@ -138,19 +139,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modules", "modules.vcproj", "{E665C76C-411C-40B2-BF0A-12E61DFFF0B7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nt_auth", "nt_auth\nt_auth.vcproj", "{236A1219-0E12-4A5D-AB03-C1680A665F05}" - ProjectSection(ProjectDependencies) = postProject - {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} - {492C477E-8D8E-442B-BB7D-E1ED24D942B2} = {492C477E-8D8E-442B-BB7D-E1ED24D942B2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntlm_win32_auth", "ntlm_win32_auth\ntlm_win32_auth.vcproj", "{B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}" - ProjectSection(ProjectDependencies) = postProject - {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} - {492C477E-8D8E-442B-BB7D-E1ED24D942B2} = {492C477E-8D8E-442B-BB7D-E1ED24D942B2} - {8C9E4410-64C5-471D-A4E2-11CDD1E56527} = {8C9E4410-64C5-471D-A4E2-11CDD1E56527} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pinger", "pinger\pinger.vcproj", "{FB6C8F4E-30A1-4A4D-8450-77005A3B9893}" ProjectSection(ProjectDependencies) = postProject {AB5858D1-01C2-43A6-9665-2ACC4CB37052} = {AB5858D1-01C2-43A6-9665-2ACC4CB37052} @@ -173,6 +161,7 @@ {AB5656AD-FBB4-4836-8E38-385FCE92780B} = {AB5656AD-FBB4-4836-8E38-385FCE92780B} {2BCD20AD-A8F3-4E68-9282-9ABAD020042F} = {2BCD20AD-A8F3-4E68-9282-9ABAD020042F} {9DD3787C-DF28-4670-B65C-DA6AB7AFBA28} = {9DD3787C-DF28-4670-B65C-DA6AB7AFBA28} + {AA5CF173-AA03-4209-AD7E-F22F840EFF9B} = {AA5CF173-AA03-4209-AD7E-F22F840EFF9B} {E665C76C-411C-40B2-BF0A-12E61DFFF0B7} = {E665C76C-411C-40B2-BF0A-12E61DFFF0B7} {B569AD4D-0243-4791-8409-8EF77B227C4D} = {B569AD4D-0243-4791-8409-8EF77B227C4D} {E798C636-AF93-446E-846C-5B6E01B5899E} = {E798C636-AF93-446E-846C-5B6E01B5899E} @@ -197,11 +186,6 @@ {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32_check_group", "win32_check_group\win32_check_group.vcproj", "{0A05ED5C-CAA9-4753-B70D-7A443099572F}" - ProjectSection(ProjectDependencies) = postProject - {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBlocking", "libBlocking\libBlocking.vcproj", "{FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libWinAIO", "libWinAIO\libWinAIO.vcproj", "{E73379FA-E241-43B2-B83F-2378EBBDD24F}" @@ -213,6 +197,35 @@ {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mswin_negotiate_auth", "mswin_negotiate_auth\mswin_negotiate_auth.vcproj", "{E9AE84F6-5932-40EA-9EFF-B9553993258E}" + ProjectSection(ProjectDependencies) = postProject + {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} + {492C477E-8D8E-442B-BB7D-E1ED24D942B2} = {492C477E-8D8E-442B-BB7D-E1ED24D942B2} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnegotiate", "libnegotiate\libnegotiate.vcproj", "{AA5CF173-AA03-4209-AD7E-F22F840EFF9B}" + ProjectSection(ProjectDependencies) = postProject + {E665C76C-411C-40B2-BF0A-12E61DFFF0B7} = {E665C76C-411C-40B2-BF0A-12E61DFFF0B7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mswin_ntlm_auth", "mswin_ntlm_auth\mswin_ntlm_auth.vcproj", "{B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}" + ProjectSection(ProjectDependencies) = postProject + {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} + {492C477E-8D8E-442B-BB7D-E1ED24D942B2} = {492C477E-8D8E-442B-BB7D-E1ED24D942B2} + {8C9E4410-64C5-471D-A4E2-11CDD1E56527} = {8C9E4410-64C5-471D-A4E2-11CDD1E56527} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mswin_auth", "mswin_auth\mswin_auth.vcproj", "{236A1219-0E12-4A5D-AB03-C1680A665F05}" + ProjectSection(ProjectDependencies) = postProject + {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} + {492C477E-8D8E-442B-BB7D-E1ED24D942B2} = {492C477E-8D8E-442B-BB7D-E1ED24D942B2} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mswin_check_lm_group", "mswin_check_lm_group\mswin_check_lm_group.vcproj", "{0A05ED5C-CAA9-4753-B70D-7A443099572F}" + ProjectSection(ProjectDependencies) = postProject + {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -339,14 +352,6 @@ {E665C76C-411C-40B2-BF0A-12E61DFFF0B7}.Debug|Win32.Build.0 = Debug|Win32 {E665C76C-411C-40B2-BF0A-12E61DFFF0B7}.Release|Win32.ActiveCfg = Release|Win32 {E665C76C-411C-40B2-BF0A-12E61DFFF0B7}.Release|Win32.Build.0 = Release|Win32 - {236A1219-0E12-4A5D-AB03-C1680A665F05}.Debug|Win32.ActiveCfg = Debug|Win32 - {236A1219-0E12-4A5D-AB03-C1680A665F05}.Debug|Win32.Build.0 = Debug|Win32 - {236A1219-0E12-4A5D-AB03-C1680A665F05}.Release|Win32.ActiveCfg = Release|Win32 - {236A1219-0E12-4A5D-AB03-C1680A665F05}.Release|Win32.Build.0 = Release|Win32 - {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}.Debug|Win32.ActiveCfg = Debug|Win32 - {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}.Debug|Win32.Build.0 = Debug|Win32 - {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}.Release|Win32.ActiveCfg = Release|Win32 - {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}.Release|Win32.Build.0 = Release|Win32 {FB6C8F4E-30A1-4A4D-8450-77005A3B9893}.Debug|Win32.ActiveCfg = Debug|Win32 {FB6C8F4E-30A1-4A4D-8450-77005A3B9893}.Debug|Win32.Build.0 = Debug|Win32 {FB6C8F4E-30A1-4A4D-8450-77005A3B9893}.Release|Win32.ActiveCfg = Release|Win32 @@ -367,10 +372,6 @@ {8B2EF167-36D3-43AC-8F3D-68E609C08EBA}.Debug|Win32.Build.0 = Debug|Win32 {8B2EF167-36D3-43AC-8F3D-68E609C08EBA}.Release|Win32.ActiveCfg = Release|Win32 {8B2EF167-36D3-43AC-8F3D-68E609C08EBA}.Release|Win32.Build.0 = Release|Win32 - {0A05ED5C-CAA9-4753-B70D-7A443099572F}.Debug|Win32.ActiveCfg = Debug|Win32 - {0A05ED5C-CAA9-4753-B70D-7A443099572F}.Debug|Win32.Build.0 = Debug|Win32 - {0A05ED5C-CAA9-4753-B70D-7A443099572F}.Release|Win32.ActiveCfg = Release|Win32 - {0A05ED5C-CAA9-4753-B70D-7A443099572F}.Release|Win32.Build.0 = Release|Win32 {FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F}.Debug|Win32.ActiveCfg = Debug|Win32 {FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F}.Debug|Win32.Build.0 = Debug|Win32 {FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F}.Release|Win32.ActiveCfg = Release|Win32 @@ -387,6 +388,26 @@ {A42166DB-7B36-4757-9987-20630AF9A15A}.Debug|Win32.Build.0 = Debug|Win32 {A42166DB-7B36-4757-9987-20630AF9A15A}.Release|Win32.ActiveCfg = Release|Win32 {A42166DB-7B36-4757-9987-20630AF9A15A}.Release|Win32.Build.0 = Release|Win32 + {E9AE84F6-5932-40EA-9EFF-B9553993258E}.Debug|Win32.ActiveCfg = Debug|Win32 + {E9AE84F6-5932-40EA-9EFF-B9553993258E}.Debug|Win32.Build.0 = Debug|Win32 + {E9AE84F6-5932-40EA-9EFF-B9553993258E}.Release|Win32.ActiveCfg = Release|Win32 + {E9AE84F6-5932-40EA-9EFF-B9553993258E}.Release|Win32.Build.0 = Release|Win32 + {AA5CF173-AA03-4209-AD7E-F22F840EFF9B}.Debug|Win32.ActiveCfg = Debug|Win32 + {AA5CF173-AA03-4209-AD7E-F22F840EFF9B}.Debug|Win32.Build.0 = Debug|Win32 + {AA5CF173-AA03-4209-AD7E-F22F840EFF9B}.Release|Win32.ActiveCfg = Release|Win32 + {AA5CF173-AA03-4209-AD7E-F22F840EFF9B}.Release|Win32.Build.0 = Release|Win32 + {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}.Debug|Win32.ActiveCfg = Debug|Win32 + {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}.Debug|Win32.Build.0 = Debug|Win32 + {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}.Release|Win32.ActiveCfg = Release|Win32 + {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18}.Release|Win32.Build.0 = Release|Win32 + {236A1219-0E12-4A5D-AB03-C1680A665F05}.Debug|Win32.ActiveCfg = Debug|Win32 + {236A1219-0E12-4A5D-AB03-C1680A665F05}.Debug|Win32.Build.0 = Debug|Win32 + {236A1219-0E12-4A5D-AB03-C1680A665F05}.Release|Win32.ActiveCfg = Release|Win32 + {236A1219-0E12-4A5D-AB03-C1680A665F05}.Release|Win32.Build.0 = Release|Win32 + {0A05ED5C-CAA9-4753-B70D-7A443099572F}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A05ED5C-CAA9-4753-B70D-7A443099572F}.Debug|Win32.Build.0 = Debug|Win32 + {0A05ED5C-CAA9-4753-B70D-7A443099572F}.Release|Win32.ActiveCfg = Release|Win32 + {0A05ED5C-CAA9-4753-B70D-7A443099572F}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Index: squid3/port/win32/update.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/update.cmd,v retrieving revision 1.2.18.9 retrieving revision 1.2.18.10 diff -u -r1.2.18.9 -r1.2.18.10 --- squid3/port/win32/update.cmd 14 Sep 2005 12:18:47 -0000 1.2.18.9 +++ squid3/port/win32/update.cmd 1 Nov 2005 20:54:19 -0000 1.2.18.10 @@ -18,12 +18,13 @@ if exist %0\..\pinger\%1\pinger.exe copy %0\..\pinger\%1\pinger.exe %2\libexec\pinger.exe copy %0\..\squidclient\%1\squidclient.exe %2\bin\squidclient.exe copy %0\..\fake_auth\%1\fake_auth.exe %2\libexec\fakeauth_auth.exe -copy %0\..\nt_auth\%1\nt_auth.exe %2\libexec\win32_auth.exe +copy %0\..\mswin_auth\%1\mswin_auth.exe %2\libexec\mswin_auth.exe copy %0\..\ncsa_auth\%1\ncsa_auth.exe %2\libexec\ncsa_auth.exe -copy %0\..\ntlm_win32_auth\%1\ntlm_win32_auth.exe %2\libexec\win32_ntlm_auth.exe +copy %0\..\mswin_ntlm_auth\%1\mswin_ntlm_auth.exe %2\libexec\mswin_ntlm_auth.exe +copy %0\..\mswin_negotiate_auth\%1\mswin_negotiate_auth.exe %2\libexec\mswin_negotiate_auth.exe copy %0\..\ldap_auth\%1\ldap_auth.exe %2\libexec\squid_ldap_auth.exe copy %0\..\ldap_group\%1\ldap_group.exe %2\libexec\squid_ldap_group.exe -copy %0\..\win32_check_group\%1\win32_check_group.exe %2\libexec\win32_check_group.exe +copy %0\..\mswin_check_lm_group\%1\mswin_check_lm_group.exe %2\libexec\mswin_check_lm_group.exe copy %0\..\ip_user_check\%1\ip_user_check.exe %2\libexec\ip_user_check.exe copy %0\..\cachemgr\%1\cachemgr.exe %2\libexec\cachemgr.cgi Index: squid3/port/win32/libnegotiate/libnegotiate.vcproj =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libnegotiate/Attic/libnegotiate.vcproj,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid3/port/win32/libnegotiate/libnegotiate.vcproj 1 Nov 2005 20:21:24 -0000 1.1.2.1 +++ squid3/port/win32/libnegotiate/libnegotiate.vcproj 1 Nov 2005 20:54:19 -0000 1.1.2.2 @@ -17,8 +17,8 @@ @@ -80,8 +80,8 @@ + +