Moved src/ACL* and a few related files into src/acl/.

Renamed ACL source files from ACLFoo.{cc,cci,h} to Foo.{cc,cci,h}.

Many targets in src/Makefile.am depended on selected ACL ACL*cc and related
sources.  These targets depend on acl/* libraries now. As a part of this
cleanup and reorganization, the number of ufsdump sources went from about 160
to about 20.

Context: SourceLayout: acl/, take 1

diff --git a/src/DelayBucket.cc b/src/DelayBucket.cc
index 8fd4ac9ce444f4d3d79ffe843d52e0d43cdc2f4d..1651ff02307cfa17e366137dc327af74437f9ed8 100644 (file)
--- a/src/DelayBucket.cc
+++ b/src/DelayBucket.cc
@@ -49,8 +49,8 @@
 #include "StoreClient.h"
 #include "MemObject.h"
 #include "client_side_request.h"
-#include "ACLChecklist.h"
-#include "ACL.h"
+#include "acl/Checklist.h"
+#include "acl/Acl.h"
 #include "ConfigParser.h"
 #include "DelayId.h"
 #include "Array.h"

diff --git a/src/DelayConfig.cc b/src/DelayConfig.cc
index a5efa35b7103614e47d626c24c5a55f4198005ed..fe2aefca56beb7d1f1f5438e9bf1e8f9220bbfa9 100644 (file)
--- a/src/DelayConfig.cc
+++ b/src/DelayConfig.cc
@@ -46,7 +46,8 @@
 #include "DelayPools.h"
 #include "DelayPool.h"
 #include "Store.h"
-#include "ACL.h"
+#include "acl/Acl.h"
+#include "acl/Gadgets.h"
 
 void
 DelayConfig::parsePoolCount()

diff --git a/src/DelayPool.cc b/src/DelayPool.cc
index 45b3096bec6a4f889a12071a241ded5572a57468..d6666c92ff75354a981a1d34be8c98956a80321e 100644 (file)
--- a/src/DelayPool.cc
+++ b/src/DelayPool.cc
@@ -41,7 +41,8 @@
 #if DELAY_POOLS
 #include "DelayPool.h"
 #include "CommonPool.h"
-#include "ACL.h"
+#include "acl/Acl.h"
+#include "acl/Gadgets.h"
 #include "Store.h"
 
 DelayPool::DelayPool() : pool (NULL), access (NULL)

diff --git a/src/DelayTagged.h b/src/DelayTagged.h
index 204f1d899d461651aca96d67cf9e28ed71972170..b75994fca3d4b446337ba1bef497a0ef545db625 100644 (file)
--- a/src/DelayTagged.h
+++ b/src/DelayTagged.h
@@ -41,7 +41,7 @@
 #if DELAY_POOLS
 
 #include "squid.h"
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "CompositePoolNode.h"
 #include "DelayIdComposite.h"
 #include "DelayBucket.h"

diff --git a/src/DelayUser.h b/src/DelayUser.h
index 604a5caa0a1361ba198c2cef37aad0d248f73bac..885389e4d5139e4c5e827c4f032d7240372a9692 100644 (file)
--- a/src/DelayUser.h
+++ b/src/DelayUser.h
@@ -41,7 +41,7 @@
 #if DELAY_POOLS
 
 #include "squid.h"
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "CompositePoolNode.h"
 #include "DelayIdComposite.h"
 #include "DelayBucket.h"

diff --git a/src/ExternalACL.h b/src/ExternalACL.h
index 11c1cbf9d79f7c026f69cfd8c7a651f8975e4b1f..0334312aeacea80679a75eeb8540d8150bc21031 100644 (file)
--- a/src/ExternalACL.h
+++ b/src/ExternalACL.h
@@ -34,7 +34,7 @@
 #ifndef SQUID_EXTERNALACL_H
 #define SQUID_EXTERNALACL_H
 
-#include "ACLChecklist.h"
+#include "acl/Checklist.h"
 
 class external_acl;
 
@@ -53,7 +53,7 @@ private:
 /** \todo CLEANUP: kill this typedef. */
 typedef struct _external_acl_data external_acl_data;
 
-#include "ACL.h"
+#include "acl/Acl.h"
 
 class ACLExternal : public ACL
 {

diff --git a/src/Makefile.am b/src/Makefile.am
index b7707ee16292ae89cb78444f37d5e9bc89a5f2c0..0d24396c9867a473e90031a3e5bd3c7dedc6b60a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ LOADABLE_MODULES_SOURCES = \
 TESTS=$(check_PROGRAMS)
 check_PROGRAMS=
 
-SUBDIRS        = base fs repl auth ip icmp
+SUBDIRS        = base acl fs repl auth ip icmp
 
 if USE_ADAPTATION
 SUBDIRS += adaptation
@@ -132,14 +132,6 @@ UNLINKD =
 endif
 
 SSL_ALL_SOURCE = \
-       ACLCertificateData.cc \
-       ACLCertificateData.h  \
-       ACLCertificate.cc \
-       ACLCertificate.h  \
-       ACLSslError.cc \
-       ACLSslError.h \
-       ACLSslErrorData.cc \
-       ACLSslErrorData.h \
        ssl_support.cc \
        ssl_support.h
 
@@ -181,20 +173,13 @@ else
 AIOPS_SOURCE = DiskIO/DiskThreads/aiops.cc
 endif
 
-IDENT_ALL_SOURCE = ACLIdent.cc ACLIdent.h ident.cc ident.h
+IDENT_ALL_SOURCE = ident.cc ident.h
 if ENABLE_IDENT
 IDENT_SOURCE = $(IDENT_ALL_SOURCE)
 else
 IDENT_SOURCE =
 endif
 
-ARP_ACL_ALL_SOURCE = ACLARP.cc ACLARP.h
-if ENABLE_ARP_ACL
-ARP_ACL_SOURCE = $(ARP_ACL_ALL_SOURCE)
-else
-ARP_ACL_SOURCE =
-endif
-
 AM_CFLAGS = @SQUID_CFLAGS@
 AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
@@ -205,7 +190,11 @@ noinst_LTLIBRARIES = libsquid.la
 # libraries used by many targets
 COMMON_LIBS = \
        libsquid.la \
-       auth/libauth.a \
+       auth/libacls.la \
+       acl/libacls.la \
+       acl/libstate.la \
+       auth/libauth.la \
+       acl/libapi.la \
        base/libbase.la \
        ip/libip.la
 
@@ -278,7 +267,6 @@ DiskIO/DiskIOModules_gen.cc: Makefile
 EXTRA_squid_SOURCES = \
        $(AIO_WIN32_ALL_SOURCES) \
        $(all_AUTHMODULES) \
-       $(ARP_ACL_ALL_SOURCE) \
        ConfigOption.h \
        $(DELAY_POOL_ALL_SOURCE) \
        dns.cc \
@@ -301,89 +289,6 @@ EXTRA_squid_SOURCES = \
        DiskIO/DiskThreads/aiops.cc \
        DiskIO/DiskThreads/aiops_win32.cc
 
-squid_ACLSOURCES = \
-       $(ARP_ACL_SOURCE) \
-       ACLASN.cc \
-       ACLASN.h \
-       ACLDestinationASN.h \
-       ACLSourceASN.h \
-       ACLBrowser.cc \
-       ACLBrowser.h \
-       ACLData.h \
-       ACLDestinationDomain.cc \
-       ACLDestinationDomain.h \
-       ACLDestinationIP.cc \
-       ACLDestinationIP.h \
-       ACLDomainData.h \
-       ACLDomainData.cc \
-       ACLExtUser.h \
-       ACLExtUser.cc \
-       ACLHTTPHeaderData.h \
-       ACLHTTPHeaderData.cc \
-       ACLHTTPStatus.h \
-       ACLHTTPStatus.cc \
-       ACLIntRange.cc \
-       ACLIntRange.h \
-       ACLIP.cc \
-       ACLIP.h \
-       ACLMaxConnection.cc \
-       ACLMaxConnection.h \
-       ACLMaxUserIP.cc \
-       ACLMaxUserIP.h \
-       ACLMethod.cc \
-       ACLMethod.h \
-       ACLMethodData.cc \
-       ACLMethodData.h \
-       ACLMyIP.cc \
-       ACLMyIP.h \
-       ACLMyPort.cc \
-       ACLMyPort.h \
-       ACLMyPortName.cc \
-       ACLMyPortName.h \
-       ACLPeerName.cc \
-       ACLPeerName.h \
-       ACLProtocol.cc \
-       ACLProtocol.h \
-       ACLProtocolData.cc \
-       ACLProtocolData.h \
-       ACLProxyAuth.cc \
-       ACLProxyAuth.h \
-       ACLReferer.cc \
-       ACLReferer.h \
-       ACLRegexData.cc \
-       ACLRegexData.h \
-       ACLReplyHeaderStrategy.h \
-       ACLReplyMIMEType.cc \
-       ACLReplyMIMEType.h \
-       ACLHTTPRepHeader.cc \
-       ACLHTTPRepHeader.h \
-       ACLHTTPReqHeader.cc \
-       ACLHTTPReqHeader.h \
-       ACLRequestHeaderStrategy.h \
-       ACLRequestMIMEType.cc \
-       ACLRequestMIMEType.h \
-       ACLSourceDomain.cc \
-       ACLSourceDomain.h \
-       ACLSourceIP.cc \
-       ACLSourceIP.h \
-       ACLStrategised.cc \
-       ACLStrategised.h \
-       ACLStrategy.h \
-       ACLStringData.cc \
-       ACLStringData.h \
-       ACLTime.cc \
-       ACLTime.h \
-       ACLTimeData.cc \
-       ACLTimeData.h \
-       ACLUrl.cc \
-       ACLUrl.h \
-       ACLUrlPath.cc \
-       ACLUrlPath.h \
-       ACLUrlPort.cc \
-       ACLUrlPort.h \
-       ACLUserData.cc \
-       ACLUserData.h 
-
 squid_COMMSOURCES = \
        comm_select.cc \
        comm_select.h \
@@ -413,12 +318,6 @@ libsquid_la_SOURCES = \
 squid_SOURCES = \
        access_log.cc \
        AccessLogEntry.h \
-       acl.cc \
-       acl_noncore.cc \
-       ACL.h \
-       ACLChecklist.cc \
-       ACLChecklist.h \
-       $(squid_ACLSOURCES) \
        asn.cc \
        AsyncCallQueue.cc \
        AsyncCallQueue.h \
@@ -427,8 +326,6 @@ squid_SOURCES = \
        AsyncJobCalls.h \
        AsyncEngine.cc \
        AsyncEngine.h \
-       authenticate.cc \
-       authenticate.h \
        cache_cf.cc \
        ProtoPort.cc \
        ProtoPort.h \
@@ -472,6 +369,7 @@ squid_SOURCES = \
        $(DNSSOURCE) \
        enums.h \
        errorpage.cc \
+       errorpage.h \
        $(ESI_SOURCE) \
        ETag.cc \
        event.cc \
@@ -637,7 +535,7 @@ squid_SOURCES = \
        $(WIN32_SOURCE) \
        $(WINSVC_SOURCE)
 
-noinst_HEADERS = ACLChecklist.cci \
+noinst_HEADERS = \
        client_side_request.cci \
        MemBuf.cci \
        MemBuf.h \
@@ -663,7 +561,6 @@ squid_LDADD = \
        @REPL_OBJS@ \
        @STORE_LIBS_TO_ADD@ \
        @DISK_LIBS@ \
-       @AUTH_LIBS_TO_ADD@ \
        @CRYPTLIB@ \
        @REGEXLIB@ \
        @SNMPLIB@ \
@@ -677,8 +574,7 @@ squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
        @STORE_LIBS_TO_ADD@ \
        @DISK_LIBS@ \
        @DISK_LINKOBJS@ \
-       @REPL_OBJS@ \
-       @AUTH_LIBS_TO_ADD@
+       @REPL_OBJS@
 
 if USE_LOADABLE_MODULES
 squid_SOURCES += $(LOADABLE_MODULES_SOURCES)
@@ -729,162 +625,20 @@ ufsdump_SOURCES = \
        String.cc \
        time.cc \
        ufsdump.cc \
-       url.cc \
-       AsyncCallQueue.cc \
-       AsyncCallQueue.h \
-       AsyncCall.cc \
-       AsyncCall.h \
-       BodyPipe.cc \
-       BodyPipe.h \
-       ConfigParser.cc \
-       store.cc \
-       StoreFileSystem.cc \
-       StoreSwapLogData.cc \
-       StoreSwapLogData.h \
-       access_log.cc \
-       acl.cc \
-       acl_noncore.cc \
-       ACLChecklist.cc \
-       ACLProxyAuth.cc \
-       ACLUserData.cc \
-       ACLRegexData.cc \
-       ACLStringData.cc \
-       authenticate.cc \
-       cache_cf.cc \
-       ProtoPort.cc \
-       ProtoPort.h \
-       cache_manager.cc \
-       CacheDigest.cc \
-       carp.cc \
-       cbdata.cc \
-       ChunkedCodingParser.cc \
-       ChunkedCodingParser.h \
-       client_db.cc \
-       client_side.cc \
-       client_side_reply.cc \
-       client_side_request.cc \
-       client_side_request.h \
-       clientStream.cc \
-       clientStream.h \
-       CommIO.h \
-       $(squid_COMMSOURCES) \
-       ConfigOption.cc \
-       defines.h \
-       $(DELAY_POOL_SOURCE) \
-       disk.cc \
        dlink.h \
        dlink.cc \
-       $(DNSSOURCE) \
-       enums.h \
-       errorpage.cc \
-       errorpage.h \
-       $(ESI_SOURCE) \
-       ETag.cc \
-       event.cc \
-       external_acl.cc \
-       ExternalACLEntry.cc \
-       fd.cc \
-       fde.cc \
-       fde.h \
-       filemap.cc \
-       forward.cc \
-       forward.h \
-       fqdncache.cc \
-       ftp.cc \
-       gopher.cc \
-       helper.cc \
-       $(HTCPSOURCE) \
-       http.cc \
-       HttpStatusLine.cc \
-       HttpHdrCc.cc \
-       HttpHdrRange.cc \
-       HttpHdrSc.cc \
-       HttpHdrScTarget.cc \
-       HttpHdrContRange.cc \
-       HttpHeader.cc \
-       HttpHeaderTools.cc \
-       HttpBody.cc \
-       HttpMsg.cc \
-       HttpReply.cc \
-       HttpRequest.cc \
        HttpRequestMethod.cc \
-       icp_v2.cc \
-       icp_v3.cc \
-       $(IDENT_SOURCE) \
-       internal.cc \
-       $(IPC_SOURCE) \
-       ipcache.cc \
-       $(LEAKFINDERSOURCE) \
-        list.cc \
-       logfile.cc \
-       mem_node.cc \
-       mem_node.h \
-       Mem.h \
-       MemBuf.cc \
-       MemObject.cc \
-       MemObject.h \
-       mime.cc \
-       multicast.cc \
-       neighbors.cc \
-       Packer.cc \
-       Parsing.cc \
-       $(XPROF_STATS_SOURCE) \
-       pconn.cc \
-       peer_digest.cc \
-       peer_select.cc \
-       peer_sourcehash.cc \
-       peer_userhash.cc \
-       protos.h \
-       redirect.cc \
-       referer.cc \
-       refresh.cc \
        RemovalPolicy.cc \
-       send-announce.cc \
-       $(SNMP_SOURCE) \
        squid.h \
-       $(SSL_SOURCE) \
-       tunnel.cc \
-       Server.cc \
-       SquidNew.cc \
-       stat.cc \
-       StatHist.cc \
-       stmem.cc \
-       store_io.cc \
-       StoreIOBuffer.h \
-       StoreIOState.cc \
-       store_client.cc \
-       StoreClient.h \
-       store_digest.cc \
-       store_dir.cc \
-       store_log.cc \
-       store_rebuild.cc \
-       store_swapin.cc \
-       store_swapmeta.cc \
-       store_swapout.cc \
-       structs.h \
-       SwapDir.cc \
-       tools.cc \
-       typedefs.h \
-       $(UNLINKDSOURCE) \
-       URLScheme.cc \
-       urn.cc \
-       useragent.cc \
-       wccp.cc \
-       wccp2.cc \
-       whois.cc \
-       wordlist.cc \
        $(WIN32_SOURCE)
 ufsdump_LDADD = \
        $(COMMON_LIBS) \
-       icmp/libicmp.la icmp/libicmp-core.la \
        @XTRA_OBJS@ \
        @REPL_OBJS@ \
        @STORE_LIBS_TO_ADD@ \
-       @AUTH_LIBS_TO_ADD@ \
        @CRYPTLIB@ \
        @REGEXLIB@ \
        @SNMPLIB@ \
-       ${ADAPTATION_LIBS} \
        @SSLLIB@ \
        -L$(top_builddir)/lib -lmiscutil \
        @XTRA_LIBS@ \
@@ -894,14 +648,10 @@ ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
        @STORE_LIBS_TO_ADD@ \
        @DISK_LIBS@ \
        @DISK_LINKOBJS@ \
-       @REPL_OBJS@ \
-       @AUTH_LIBS_TO_ADD@
+       @REPL_OBJS@
 
 nodist_ufsdump_SOURCES = \
-       repl_modules.cc \
-       cf_parser.h \
-       globals.cc \
-       string_arrays.c
+       globals.cc
 
 BUILT_SOURCES = \
        cf_gen_defines.h \
@@ -1163,13 +913,12 @@ CLEANFILES += testHeaders.c
 
 tests_testAuth_SOURCES = \
        tests/testAuth.cc tests/testMain.cc  tests/testAuth.h \
-       authenticate.cc \
        ConfigParser.cc \
        tests/stub_acl.cc tests/stub_cache_cf.cc \
        tests/stub_helper.cc cbdata.cc String.cc \
-       tests/stub_store.cc HttpHeaderTools.cc HttpHeader.cc acl.cc mem.cc \
-       MemBuf.cc HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc \
-       HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
+       tests/stub_store.cc HttpHeaderTools.cc HttpHeader.cc mem.cc \
+       MemBuf.cc HttpHdrContRange.cc Packer.cc HttpHdrCc.cc HttpHdrSc.cc \
+       HttpHdrScTarget.cc url.cc \
        StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
        tests/stub_HttpRequest.cc tests/stub_DelayId.cc \
        tests/stub_MemObject.cc mem_node.cc \
@@ -1194,22 +943,19 @@ nodist_tests_testAuth_SOURCES = \
 
 tests_testAuth_LDADD= \
        $(COMMON_LIBS) \
-       @AUTH_LIBS_TO_ADD@ \
        -L../lib -lmiscutil \
        @REGEXLIB@ \
        @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 tests_testAuth_LDFLAGS = $(LIBADD_DL)
 tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
-       @AUTH_LIBS_TO_ADD@ \
        @SQUID_CPPUNIT_LA@
 
 ## Tests for the ACLMaxUserIP class
 ## acl needs wordlist. wordlist needs MemBug
 ## MemBuf needs mem, MemBuf needs event,
 ## event needs cbdata.
-## ACLMaxUserUP needs authenticate.cc
-## authenticate.cc needs libauth.la
+## ACLMaxUserUP needs libauth.la
 ## ACLMaxUserIP needs ACLChecklist
 ## AuthUser request needs HttpHeader, which brings in 
 ##     ETag.cc \
@@ -1224,13 +970,6 @@ tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
 ##     StatHist.cc \
 ##     String.cc \
 tests_testACLMaxUserIP_SOURCES= \
-       acl.cc \
-       ACLChecklist.cc \
-       ACLMaxUserIP.cc \
-       ACLProxyAuth.cc \
-       ACLRegexData.cc \
-       ACLUserData.cc \
-       authenticate.cc \
        cbdata.cc \
        ConfigParser.cc \
        ETag.cc \
@@ -1302,14 +1041,6 @@ tests_testCacheManager_SOURCES = \
        tests/testMain.cc \
        time.cc \
        access_log.cc \
-       acl.cc \
-       acl_noncore.cc \
-       ACLChecklist.cc \
-       ACLProxyAuth.cc \
-       ACLStringData.cc \
-       ACLRegexData.cc \
-       ACLUserData.cc \
-       authenticate.cc \
        BodyPipe.cc \
        cache_manager.cc \
        cache_cf.cc \
@@ -1452,10 +1183,11 @@ tests_testDiskIO_SOURCES = \
 nodist_tests_testDiskIO_SOURCES= \
        $(SWAP_TEST_GEN_SOURCES)
 tests_testDiskIO_LDADD = \
-       $(COMMON_LIBS) \
-       @DISK_LIBS@ \
        $(SWAP_TEST_LDADD) \
+       @DISK_LIBS@ \
+       $(COMMON_LIBS) \
        SquidConfig.o
+
 tests_testDiskIO_LDFLAGS = $(LIBADD_DL)
 tests_testDiskIO_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
        @DISK_LIBS@ \
@@ -1478,14 +1210,6 @@ tests_testEvent_SOURCES = \
        tests/testMain.cc \
        time.cc \
        access_log.cc \
-       acl.cc \
-       acl_noncore.cc \
-       ACLChecklist.cc \
-       ACLProxyAuth.cc \
-       ACLStringData.cc \
-       ACLRegexData.cc \
-       ACLUserData.cc \
-       authenticate.cc \
        BodyPipe.cc \
        cache_manager.cc \
        cache_cf.cc \
@@ -1633,14 +1357,6 @@ tests_testEventLoop_SOURCES = \
        tests/testMain.cc \
        time.cc \
        access_log.cc \
-       acl.cc \
-       acl_noncore.cc \
-       ACLChecklist.cc \
-       ACLProxyAuth.cc \
-       ACLStringData.cc \
-       ACLRegexData.cc \
-       ACLUserData.cc \
-       authenticate.cc \
        BodyPipe.cc \
        cache_manager.cc \
        cache_cf.cc \
@@ -1776,14 +1492,6 @@ tests_testEventLoop_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
 tests_test_http_range_SOURCES = \
        tests/test_http_range.cc \
        access_log.cc \
-       acl.cc \
-       acl_noncore.cc \
-       ACLChecklist.cc \
-       ACLProxyAuth.cc \
-       ACLStringData.cc \
-       ACLRegexData.cc \
-       ACLUserData.cc \
-       authenticate.cc \
        BodyPipe.cc \
        cache_cf.cc \
        ProtoPort.cc \
@@ -1938,14 +1646,6 @@ tests_testHttpRequest_SOURCES = \
        tests/testMain.cc \
        time.cc \
        access_log.cc \
-       acl.cc \
-       acl_noncore.cc \
-       ACLChecklist.cc \
-       ACLProxyAuth.cc \
-       ACLStringData.cc \
-       ACLRegexData.cc \
-       ACLUserData.cc \
-       authenticate.cc \
        BodyPipe.cc \
        cache_manager.cc \
        cache_cf.cc \
@@ -2097,7 +1797,6 @@ STORE_TEST_SOURCES=\
        Parsing.cc \
        ConfigOption.cc \
        SwapDir.cc \
-       authenticate.cc \
        tests/stub_acl.cc tests/stub_cache_cf.cc \
        tests/stub_helper.cc cbdata.cc String.cc \
        tests/stub_comm.cc \
@@ -2106,10 +1805,9 @@ STORE_TEST_SOURCES=\
        mem_node.cc \
        stmem.cc \
        tests/stub_mime.cc \
-       HttpHeaderTools.cc HttpHeader.cc acl.cc mem.cc \
-       acl_noncore.cc \
-       MemBuf.cc HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc \
-       HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
+       HttpHeaderTools.cc HttpHeader.cc mem.cc \
+       MemBuf.cc HttpHdrContRange.cc Packer.cc HttpHdrCc.cc HttpHdrSc.cc \
+       HttpHdrScTarget.cc url.cc \
        StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
        tests/stub_HttpRequest.cc tests/stub_access_log.cc \
        refresh.cc \
@@ -2223,6 +1921,7 @@ SWAP_TEST_LDADD = \
        @REPL_OBJS@ \
        @DISK_LIBS@ \
        -L../lib -lmiscutil \
+       acl/libapi.la \
        @SQUID_CPPUNIT_LIBS@
 SWAP_TEST_DS =\
        $(top_builddir)/lib/libmiscutil.a \
@@ -2241,8 +1940,8 @@ tests_testUfs_SOURCES = \
 nodist_tests_testUfs_SOURCES = \
        $(SWAP_TEST_GEN_SOURCES)
 tests_testUfs_LDADD = \
-       $(COMMON_LIBS) \
        $(SWAP_TEST_LDADD) \
+       $(COMMON_LIBS) \
        @SSLLIB@
 tests_testUfs_LDFLAGS = $(LIBADD_DL)
 tests_testUfs_DEPENDENCIES = \
@@ -2296,14 +1995,6 @@ tests_testURL_SOURCES = \
        tests/testMain.cc \
        time.cc \
        access_log.cc \
-       acl.cc \
-       acl_noncore.cc \
-       ACLChecklist.cc \
-       ACLProxyAuth.cc \
-       ACLStringData.cc \
-       ACLRegexData.cc \
-       ACLUserData.cc \
-       authenticate.cc \
        BodyPipe.cc \
        cache_manager.cc \
        cache_cf.cc \

diff --git a/src/access_log.cc b/src/access_log.cc
index 9f7c1f2f378809ac4e9f4ec1b30e84815c6311ec..7ff76f26af93e3cf37566b52b68b502f5e6e3511 100644 (file)
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -39,7 +39,7 @@
 // Store.h Required by configuration directives parsing/dumping only
 #include "Store.h"
 
-#include "ACLChecklist.h"
+#include "acl/Checklist.h"
 
 #include "HttpReply.h"
 #include "HttpRequest.h"

diff --git a/src/ACLARP.h b/src/acl/Arp.h
similarity index 97%
rename from src/ACLARP.h
rename to src/acl/Arp.h
index 51a7c0108b9079380db7b4e17820533ff265b67f..68cce6c48698fe125b630b999a37cb1cb6c9e00a 100644 (file)
--- a/src/ACLARP.h
+++ b/src/acl/Arp.h
@@ -35,8 +35,8 @@
 #ifndef SQUID_ACLARP_H
 #define SQUID_ACLARP_H
 
-#include "ACL.h"
-#include "ACLChecklist.h"
+#include "acl/Acl.h"
+#include "acl/Checklist.h"
 #include "splay.h"
 
 /// \ingroup ACLAPI

diff --git a/src/ACLASN.cc b/src/acl/Asn.cc
similarity index 96%
rename from src/ACLASN.cc
rename to src/acl/Asn.cc
index 78f0fe236ad1afd848914d298bac670828243669..63ba9cd77de687deb1664df8b5e0c5abda4d8ef1 100644 (file)
--- a/src/ACLASN.cc
+++ b/src/acl/Asn.cc
@@ -34,6 +34,6 @@
  */
 
 #include "squid.h"
-#include "ACLASN.h"
-#include "ACLChecklist.h"
+#include "acl/Asn.h"
+#include "acl/Checklist.h"
 

diff --git a/src/ACLASN.h b/src/acl/Asn.h
similarity index 96%
rename from src/ACLASN.h
rename to src/acl/Asn.h
index 1879be32aefe4acf67296c99aa965c90a0775b9a..ca44df2682c1000618c126c593e7f7a656230b54 100644 (file)
--- a/src/ACLASN.h
+++ b/src/acl/Asn.h
@@ -32,10 +32,10 @@
 #ifndef SQUID_ACLASN_H
 #define SQUID_ACLASN_H
 
-#include "ACLData.h"
+#include "acl/Data.h"
 #include "CbDataList.h"
-#include "ACLStrategised.h"
-#include "ACLChecklist.h"
+#include "acl/Strategised.h"
+#include "acl/Checklist.h"
 #include "ip/IpAddress.h"
 
 SQUIDCEXTERN int asnMatchIp(CbDataList<int> *, IpAddress &);

diff --git a/src/ACLBrowser.cc b/src/acl/Browser.cc
similarity index 95%
rename from src/ACLBrowser.cc
rename to src/acl/Browser.cc
index 2ca7db8d8bcdc61db17a2f5cb2d91956853c75bd..5854253ed79ef92ce33532bbde054af5bf69c9af 100644 (file)
--- a/src/ACLBrowser.cc
+++ b/src/acl/Browser.cc
@@ -35,9 +35,9 @@
  */
 
 #include "squid.h"
-#include "ACLChecklist.h"
-#include "ACLBrowser.h"
-#include "ACLRegexData.h"
+#include "acl/Checklist.h"
+#include "acl/Browser.h"
+#include "acl/RegexData.h"
 
 /* explicit template instantiation required for some systems */
 

diff --git a/src/ACLBrowser.h b/src/acl/Browser.h
similarity index 93%
rename from src/ACLBrowser.h
rename to src/acl/Browser.h
index 998af7c821f0882de9e9ca351991c33687753ffb..2ef93b3ac28f18a5d07668b33558abb2ab42b37f 100644 (file)
--- a/src/ACLBrowser.h
+++ b/src/acl/Browser.h
@@ -35,10 +35,10 @@
 #ifndef SQUID_ACLBROWSER_H
 #define SQUID_ACLBROWSER_H
 
-#include "ACL.h"
-#include "ACLData.h"
-#include "ACLRequestHeaderStrategy.h"
-#include "ACLStrategised.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
+#include "acl/RequestHeaderStrategy.h"
+#include "acl/Strategised.h"
 
 /// \ingroup ACLAPI
 class ACLBrowser

diff --git a/src/ACLCertificateData.cc b/src/acl/CertificateData.cc
similarity index 97%
rename from src/ACLCertificateData.cc
rename to src/acl/CertificateData.cc
index b74d8de515676e6c882bed5cb1bbc27cbbe27b9f..9921732d6db27d76505944111b941ac821d0fa3d 100644 (file)
--- a/src/ACLCertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -35,9 +35,8 @@
  */
 
 #include "squid.h"
-#include "ACLCertificateData.h"
-#include "authenticate.h"
-#include "ACLChecklist.h"
+#include "acl/CertificateData.h"
+#include "acl/Checklist.h"
 #include "wordlist.h"
 
 ACLCertificateData::ACLCertificateData(SSLGETATTRIBUTE *sslStrategy) : attribute (NULL), values (), sslAttributeCall (sslStrategy)

diff --git a/src/ACLCertificateData.h b/src/acl/CertificateData.h
similarity index 96%
rename from src/ACLCertificateData.h
rename to src/acl/CertificateData.h
index 4a2f6d7ab8acfc073c37e1ddc52672bf77b45256..8000b4181ff18ec0bccde97bf3dad22546d2c1a4 100644 (file)
--- a/src/ACLCertificateData.h
+++ b/src/acl/CertificateData.h
@@ -36,10 +36,10 @@
 #define SQUID_ACLCERTIFICATEDATA_H
 
 #include "splay.h"
-#include "ACL.h"
-#include "ACLData.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
 #include "ssl_support.h"
-#include "ACLStringData.h"
+#include "acl/StringData.h"
 
 /// \ingroup ACLAPI
 class ACLCertificateData : public ACLData<SSL *>

diff --git a/src/ACLData.h b/src/acl/Data.h
similarity index 100%
rename from src/ACLData.h
rename to src/acl/Data.h

diff --git a/src/ACLDestinationIP.h b/src/acl/DestinationIp.h
similarity index 97%
rename from src/ACLDestinationIP.h
rename to src/acl/DestinationIp.h
index 8d185452136bc87211801d881e48bdb3dd913a57..537b1464297206774851054976cdd44a97aae774 100644 (file)
--- a/src/ACLDestinationIP.h
+++ b/src/acl/DestinationIp.h
@@ -35,8 +35,8 @@
 
 #ifndef SQUID_ACLDESTINATIONIP_H
 #define SQUID_ACLDESTINATIONIP_H
-#include "ACLChecklist.h"
-#include "ACLIP.h"
+#include "acl/Checklist.h"
+#include "acl/Ip.h"
 
 class DestinationIPLookup : public ACLChecklist::AsyncState
 {

diff --git a/src/ACLDomainData.cc b/src/acl/DomainData.cc
similarity index 98%
rename from src/ACLDomainData.cc
rename to src/acl/DomainData.cc
index 508cb2a0ec2bcc319b9c198ce5948aecdab8bf79..320d42ed17bf2d927eca3b69c260044a748cbca4 100644 (file)
--- a/src/ACLDomainData.cc
+++ b/src/acl/DomainData.cc
@@ -35,9 +35,8 @@
  */
 
 #include "squid.h"
-#include "ACLDomainData.h"
-#include "authenticate.h"
-#include "ACLChecklist.h"
+#include "acl/DomainData.h"
+#include "acl/Checklist.h"
 #include "wordlist.h"
 
 template<class T>

diff --git a/src/ACLDomainData.h b/src/acl/DomainData.h
similarity index 97%
rename from src/ACLDomainData.h
rename to src/acl/DomainData.h
index 724452102bdc34e66eec3fe6e2aa8321bea69b5e..fbd0838f985bcb8f3dbe6dcf2d33fe395198611b 100644 (file)
--- a/src/ACLDomainData.h
+++ b/src/acl/DomainData.h
@@ -36,8 +36,8 @@
 #define SQUID_ACLDOMAINDATA_H
 
 #include "splay.h"
-#include "ACL.h"
-#include "ACLData.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
 
 /// \ingroup ACLAPI
 class ACLDomainData : public ACLData<char const *>

diff --git a/src/ACLExtUser.h b/src/acl/ExtUser.h
similarity index 97%
rename from src/ACLExtUser.h
rename to src/acl/ExtUser.h
index 3aa3773c346ee1c9d1f7ec0089cb320c6362eb4a..fa4294f15a41442c69b17b1e21016a716cec8d57 100644 (file)
--- a/src/ACLExtUser.h
+++ b/src/acl/ExtUser.h
@@ -35,9 +35,9 @@
 #ifndef SQUID_ACLIDENT_H
 #define SQUID_ACLIDENT_H
 
-#include "ACL.h"
-#include "ACLChecklist.h"
-#include "ACLData.h"
+#include "acl/Acl.h"
+#include "acl/Checklist.h"
+#include "acl/Data.h"
 
 /// \ingroup ACLAPI
 class ACLExtUser : public ACL

diff --git a/src/ACLHTTPHeaderData.cc b/src/acl/HttpHeaderData.cc
similarity index 96%
rename from src/ACLHTTPHeaderData.cc
rename to src/acl/HttpHeaderData.cc
index a73f6dcbd0f8c300efea5e863ebfd85095df71f0..e7d5f3df448e3a45d320394a29a3afd73504f7fe 100644 (file)
--- a/src/ACLHTTPHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -35,11 +35,10 @@
  */
 
 #include "squid.h"
-#include "ACLHTTPHeaderData.h"
-#include "authenticate.h"
-#include "ACLChecklist.h"
-#include "ACL.h"
-#include "ACLRegexData.h"
+#include "acl/HttpHeaderData.h"
+#include "acl/Checklist.h"
+#include "acl/Acl.h"
+#include "acl/RegexData.h"
 #include "wordlist.h"
 #include "ConfigParser.h"
 

diff --git a/src/ACLHTTPHeaderData.h b/src/acl/HttpHeaderData.h
similarity index 99%
rename from src/ACLHTTPHeaderData.h
rename to src/acl/HttpHeaderData.h
index 960b2576ddd15fb9ddf2ba5ee0ead6a654e8ee2b..323906faeb32382d1740aa123f3ecb4bae505928 100644 (file)
--- a/src/ACLHTTPHeaderData.h
+++ b/src/acl/HttpHeaderData.h
@@ -38,7 +38,7 @@ class HttpHeader;
 class wordlist;
 
 /* becaue we inherit from it */
-#include "ACLData.h"
+#include "acl/Data.h"
 /* for String field */
 #include "SquidString.h"
 /* for http_hdr_type field */

diff --git a/src/ACLHTTPStatus.h b/src/acl/HttpStatus.h
similarity index 98%
rename from src/ACLHTTPStatus.h
rename to src/acl/HttpStatus.h
index 75af4323bb143cd4e8e331c2e6f31e5804634f8f..85033d7e24994fd6fe7f13fa2bc23f8e80c438a5 100644 (file)
--- a/src/ACLHTTPStatus.h
+++ b/src/acl/HttpStatus.h
@@ -35,8 +35,8 @@
 #ifndef SQUID_ACLHTTPSTATUS_H
 #define SQUID_ACLHTTPSTATUS_H
 
-#include "ACL.h"
-#include "ACLChecklist.h"
+#include "acl/Acl.h"
+#include "acl/Checklist.h"
 #include "splay.h"
 
 /// \ingroup ACLAPI

diff --git a/src/ACLIdent.h b/src/acl/Ident.h
similarity index 97%
rename from src/ACLIdent.h
rename to src/acl/Ident.h
index 3c563e9b6aa94b976a4a9c6158d111d59aa3d9fb..edbdf5a10fbe61669ebd44474a6fc9afb48c9c4e 100644 (file)
--- a/src/ACLIdent.h
+++ b/src/acl/Ident.h
@@ -35,7 +35,7 @@
 #ifndef SQUID_ACLIDENT_H
 #define SQUID_ACLIDENT_H
 
-#include "ACLChecklist.h"
+#include "acl/Checklist.h"
 
 /// \ingroup ACLAPI
 class IdentLookup : public ACLChecklist::AsyncState
@@ -51,8 +51,8 @@ private:
 };
 
 
-#include "ACL.h"
-#include "ACLData.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
 
 /// \ingroup ACLAPI
 class ACLIdent : public ACL

diff --git a/src/ACLIntRange.cc b/src/acl/IntRange.cc
similarity index 99%
rename from src/ACLIntRange.cc
rename to src/acl/IntRange.cc
index 0482dba74a58aba16f9b2c860b5e89a04fb7abf7..7d0f3758c962e233a6bd083d11457fb12c152679 100644 (file)
--- a/src/ACLIntRange.cc
+++ b/src/acl/IntRange.cc
@@ -35,7 +35,7 @@
  */
 
 #include "squid.h"
-#include "ACLIntRange.h"
+#include "acl/IntRange.h"
 #include "wordlist.h"
 #include "Parsing.h"
 

diff --git a/src/ACLIntRange.h b/src/acl/IntRange.h
similarity index 98%
rename from src/ACLIntRange.h
rename to src/acl/IntRange.h
index 9e75ecba7bec28c33bc030d1381c31c158bc748b..d4bb1a6f369cae69eddf302c9421e7761f2a6c80 100644 (file)
--- a/src/ACLIntRange.h
+++ b/src/acl/IntRange.h
@@ -35,7 +35,7 @@
 #ifndef SQUID_ACLINTRANGE_H
 #define SQUID_ACLINTRANGE_H
 
-#include "ACLData.h"
+#include "acl/Data.h"
 #include "CbDataList.h"
 #include "Range.h"
 

diff --git a/src/ACLIP.cc b/src/acl/Ip.cc
similarity index 99%
rename from src/ACLIP.cc
rename to src/acl/Ip.cc
index c1372098eb74b5bfb21ccd83606803739517a0b9..d135ab9a82032c47704257429e40445cd6de5361 100644 (file)
--- a/src/ACLIP.cc
+++ b/src/acl/Ip.cc
@@ -34,8 +34,8 @@
  */
 
 #include "squid.h"
-#include "ACLIP.h"
-#include "ACLChecklist.h"
+#include "acl/Ip.h"
+#include "acl/Checklist.h"
 #include "MemBuf.h"
 #include "wordlist.h"
 

diff --git a/src/ACLIP.h b/src/acl/Ip.h
similarity index 99%
rename from src/ACLIP.h
rename to src/acl/Ip.h
index 74f89757570ae40890845c410f099493acdc8054..9ff8cea16eaec21e91bb54502671233a8c7308e9 100644 (file)
--- a/src/ACLIP.h
+++ b/src/acl/Ip.h
@@ -32,7 +32,7 @@
 #ifndef SQUID_ACLIP_H
 #define SQUID_ACLIP_H
 
-#include "ACL.h"
+#include "acl/Acl.h"
 #include "splay.h"
 #include "ip/IpAddress.h"
 

diff --git a/src/acl/Makefile.am b/src/acl/Makefile.am
new file mode 100644 (file)
index 0000000..41cbcee
--- /dev/null
+++ b/src/acl/Makefile.am
@@ -0,0 +1,142 @@
+include $(top_srcdir)/src/Common.am
+include $(top_srcdir)/src/TestHeaders.am
+
+noinst_LTLIBRARIES = libapi.la libstate.la libacls.la
+
+## General data-independent ACL API
+libapi_la_SOURCES = \
+       Acl.cc \
+       Acl.h \
+       Checklist.cc \
+       Checklist.h
+
+## Data-dependent Squid/transaction state used by specific ACLs.
+## Does not refer to specific ACLs to avoid circular dependencies.
+libstate_la_SOURCES = \
+       Data.h \
+       Strategy.h \
+       Strategised.cc \
+       Strategised.h \
+       \
+       FilledChecklist.cc \
+       FilledChecklist.h
+
+## data-specific ACLs
+libacls_la_SOURCES = \
+       IntRange.cc \
+       IntRange.h \
+       RegexData.cc \
+       RegexData.h \
+       StringData.cc \
+       StringData.h \
+       Time.cc \
+       Time.h \
+       TimeData.cc \
+       TimeData.h \
+       \
+       Asn.cc \
+       Asn.h \
+       Browser.cc \
+       Browser.h \
+       DestinationAsn.h \
+       DestinationDomain.cc \
+       DestinationDomain.h \
+       DestinationIp.cc \
+       DestinationIp.h \
+       DomainData.cc \
+       DomainData.h \
+       ExtUser.cc \
+       ExtUser.h \
+       HttpHeaderData.cc \
+       HttpHeaderData.h \
+       HttpRepHeader.cc \
+       HttpRepHeader.h \
+       HttpReqHeader.cc \
+       HttpReqHeader.h \
+       HttpStatus.cc \
+       HttpStatus.h \
+       Ip.cc \
+       Ip.h \
+       MaxConnection.cc \
+       MaxConnection.h \
+       Method.cc \
+       MethodData.cc \
+       MethodData.h \
+       Method.h \
+       MyIp.cc \
+       MyIp.h \
+       MyPort.cc \
+       MyPort.h \
+       MyPortName.cc \
+       MyPortName.h \
+       PeerName.cc \
+       PeerName.h \
+       Protocol.cc \
+       ProtocolData.cc \
+       ProtocolData.h \
+       Protocol.h \
+       Referer.cc \
+       Referer.h \
+       ReplyHeaderStrategy.h \
+       ReplyMimeType.cc \
+       ReplyMimeType.h \
+       RequestHeaderStrategy.h \
+       RequestMimeType.cc \
+       RequestMimeType.h \
+       SourceAsn.h \
+       SourceDomain.cc \
+       SourceDomain.h \
+       SourceIp.cc \
+       SourceIp.h \
+       Url.cc \
+       Url.h \
+       UrlPath.cc \
+       UrlPath.h \
+       UrlPort.cc \
+       UrlPort.h \
+       UserData.cc \
+       UserData.h \
+       \
+       Gadgets.cc \
+       Gadgets.h
+
+## Add conditional sources
+## TODO: move these to their respectful dirs when those dirs are created
+
+EXTRA_libacls_la_SOURCES =
+
+SSL_ACLS = \
+        CertificateData.cc \
+        CertificateData.h  \
+        Certificate.cc \
+        Certificate.h  \
+        SslError.cc \
+        SslError.h \
+        SslErrorData.cc \
+        SslErrorData.h
+
+if ENABLE_SSL
+libacls_la_SOURCES += $(SSL_ACLS)
+endif
+
+EXTRA_libacls_la_SOURCES += $(SSL_ACLS)
+
+
+ARP_ACLS = Arp.cc Arp.h
+
+if ENABLE_ARP_ACL
+libacls_la_SOURCES += $(ARP_ACLS)
+endif
+
+EXTRA_libacls_la_SOURCES += $(ARP_ACLS)
+
+
+IDENT_ACLS = Ident.cc Ident.h
+
+if ENABLE_IDENT
+libacls_la_SOURCES += $(IDENT_ACLS)
+endif
+
+EXTRA_libacls_la_SOURCES += $(IDENT_ACLS)
+
+

diff --git a/src/ACLMaxConnection.h b/src/acl/MaxConnection.h
similarity index 97%
rename from src/ACLMaxConnection.h
rename to src/acl/MaxConnection.h
index 55ce594a8cd280f60ac6dcfec31158a7774b2ccd..b01f3d46ab8d54149d4b4513f45ee5b1936ec8b9 100644 (file)
--- a/src/ACLMaxConnection.h
+++ b/src/acl/MaxConnection.h
@@ -35,8 +35,8 @@
 #ifndef SQUID_ACLMAXCONNECTION_H
 #define SQUID_ACLMAXCONNECTION_H
 
-#include "ACL.h"
-#include "ACLChecklist.h"
+#include "acl/Acl.h"
+#include "acl/Checklist.h"
 
 /// \ingroup ACLAPI
 class ACLMaxConnection : public ACL

diff --git a/src/ACLMethodData.cc b/src/acl/MethodData.cc
similarity index 98%
rename from src/ACLMethodData.cc
rename to src/acl/MethodData.cc
index 2f42b3048ade227f384fff378ed4decf55e7b50f..b502f7be4872cf799ddf832e2adb36eabd25d97d 100644 (file)
--- a/src/ACLMethodData.cc
+++ b/src/acl/MethodData.cc
@@ -35,8 +35,8 @@
  */
 
 #include "squid.h"
-#include "ACLMethodData.h"
-#include "ACLChecklist.h"
+#include "acl/MethodData.h"
+#include "acl/Checklist.h"
 #include "HttpRequestMethod.h"
 #include "wordlist.h"
 

diff --git a/src/ACLMethodData.h b/src/acl/MethodData.h
similarity index 97%
rename from src/ACLMethodData.h
rename to src/acl/MethodData.h
index 46bff2c6d7553671c92605ac0e3294d1c6aa47a6..062efc81547134f0c02e14f113f0d82bc2ae8afb 100644 (file)
--- a/src/ACLMethodData.h
+++ b/src/acl/MethodData.h
@@ -35,8 +35,8 @@
 #ifndef SQUID_ACLMETHODDATA_H
 #define SQUID_ACLMETHODDATA_H
 
-#include "ACL.h"
-#include "ACLData.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
 #include "CbDataList.h"
 
 /// \ingroup ACLAPI

diff --git a/src/ACLMyIP.h b/src/acl/MyIp.h
similarity index 98%
rename from src/ACLMyIP.h
rename to src/acl/MyIp.h
index b8302e71f09369cc08592346836fb76dcfee9f74..114d837a8963e99e2603f04e9b21c23ec42c2b42 100644 (file)
--- a/src/ACLMyIP.h
+++ b/src/acl/MyIp.h
@@ -35,7 +35,7 @@
 #ifndef SQUID_ACLMYIP_H
 #define SQUID_ACLMYIP_H
 
-#include "ACLIP.h"
+#include "acl/Ip.h"
 
 /// \ingroup ACLAPI
 class ACLMyIP : public ACLIP

diff --git a/src/ACLProtocolData.cc b/src/acl/ProtocolData.cc
similarity index 98%
rename from src/ACLProtocolData.cc
rename to src/acl/ProtocolData.cc
index a087ea6e75e7877f9231df162c3a11b11fa0f460..6fef08809226b664cdb6ff342843fa0b141b61e1 100644 (file)
--- a/src/ACLProtocolData.cc
+++ b/src/acl/ProtocolData.cc
@@ -35,8 +35,8 @@
  */
 
 #include "squid.h"
-#include "ACLProtocolData.h"
-#include "ACLChecklist.h"
+#include "acl/ProtocolData.h"
+#include "acl/Checklist.h"
 #include "URLScheme.h"
 #include "wordlist.h"
 

diff --git a/src/ACLProtocolData.h b/src/acl/ProtocolData.h
similarity index 97%
rename from src/ACLProtocolData.h
rename to src/acl/ProtocolData.h
index 8406311c391258435a2c8768886617931b840c54..af987469140663bcc657c5036e35804f783f88ea 100644 (file)
--- a/src/ACLProtocolData.h
+++ b/src/acl/ProtocolData.h
@@ -35,8 +35,8 @@
 
 #ifndef SQUID_ACLPROTOCOLDATA_H
 #define SQUID_ACLPROTOCOLDATA_H
-#include "ACL.h"
-#include "ACLData.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
 #include "CbDataList.h"
 
 class ACLProtocolData : public ACLData<protocol_t>

diff --git a/src/ACLReferer.cc b/src/acl/Referer.cc
similarity index 95%
rename from src/ACLReferer.cc
rename to src/acl/Referer.cc
index 0d103a1e9c3f8ff629050d4d8d42c84d904de1af..3a97bad5a90a5832662e54503e6fd4a7d07b6986 100644 (file)
--- a/src/ACLReferer.cc
+++ b/src/acl/Referer.cc
@@ -35,9 +35,9 @@
  */
 
 #include "squid.h"
-#include "ACLReferer.h"
-#include "ACLChecklist.h"
-#include "ACLRegexData.h"
+#include "acl/Referer.h"
+#include "acl/Checklist.h"
+#include "acl/RegexData.h"
 
 /* explicit template instantiation required for some systems */
 

diff --git a/src/ACLReferer.h b/src/acl/Referer.h
similarity index 93%
rename from src/ACLReferer.h
rename to src/acl/Referer.h
index a485e98e593f66ad52b2d9578d4dab7305e7e89f..f1fe216e77efd101c6a9e0f92333acff3e710023 100644 (file)
--- a/src/ACLReferer.h
+++ b/src/acl/Referer.h
@@ -35,10 +35,10 @@
 
 #ifndef SQUID_ACLREFERER_H
 #define SQUID_ACLREFERER_H
-#include "ACL.h"
-#include "ACLData.h"
-#include "ACLRequestHeaderStrategy.h"
-#include "ACLStrategised.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
+#include "acl/RequestHeaderStrategy.h"
+#include "acl/Strategised.h"
 
 class ACLReferer
 {

diff --git a/src/ACLRegexData.cc b/src/acl/RegexData.cc
similarity index 97%
rename from src/ACLRegexData.cc
rename to src/acl/RegexData.cc
index 8fa6869b6f42216c65e7bd4a16d1e5f5d721ada6..03314eaea7bf1f1750ae90eda21ff1e3f34f5b55 100644 (file)
--- a/src/ACLRegexData.cc
+++ b/src/acl/RegexData.cc
@@ -35,10 +35,9 @@
  */
 
 #include "squid.h"
-#include "ACLRegexData.h"
-#include "authenticate.h"
-#include "ACLChecklist.h"
-#include "ACL.h"
+#include "acl/RegexData.h"
+#include "acl/Checklist.h"
+#include "acl/Acl.h"
 #include "wordlist.h"
 #include "ConfigParser.h"
 

diff --git a/src/ACLRegexData.h b/src/acl/RegexData.h
similarity index 98%
rename from src/ACLRegexData.h
rename to src/acl/RegexData.h
index 9806f1a7ed62bea73c9aa80893d9a3e812e0119c..e577c59e523d383fe85704f6f0a520e618277d24 100644 (file)
--- a/src/ACLRegexData.h
+++ b/src/acl/RegexData.h
@@ -34,7 +34,7 @@
 #ifndef SQUID_ACLREGEXDATA_H
 #define SQUID_ACLREGEXDATA_H
 
-#include "ACLData.h"
+#include "acl/Data.h"
 #include "MemPool.h"
 
 /** \todo CLEANUP: break out relist, we don't need the rest. */

diff --git a/src/ACLReplyMIMEType.cc b/src/acl/ReplyMimeType.cc
similarity index 95%
rename from src/ACLReplyMIMEType.cc
rename to src/acl/ReplyMimeType.cc
index ba24d1f1d5a9249eef4ad71bad4d495b1e4c0e62..ff07b65a28e22d4d6f048c64377a50f6befee986 100644 (file)
--- a/src/ACLReplyMIMEType.cc
+++ b/src/acl/ReplyMimeType.cc
@@ -35,9 +35,9 @@
  */
 
 #include "squid.h"
-#include "ACLReplyMIMEType.h"
-#include "ACLChecklist.h"
-#include "ACLRegexData.h"
+#include "acl/ReplyMimeType.h"
+#include "acl/Checklist.h"
+#include "acl/RegexData.h"
 
 /* explicit template instantiation required for some systems */
 

diff --git a/src/ACLRequestMIMEType.cc b/src/acl/RequestMimeType.cc
similarity index 95%
rename from src/ACLRequestMIMEType.cc
rename to src/acl/RequestMimeType.cc
index f8ea3fc5c614a9e19d44bd8b56b1f6a29cf6d5b2..91e921db47732d2992f939ce9b530faba441fe72 100644 (file)
--- a/src/ACLRequestMIMEType.cc
+++ b/src/acl/RequestMimeType.cc
@@ -35,9 +35,9 @@
  */
 
 #include "squid.h"
-#include "ACLRequestMIMEType.h"
-#include "ACLChecklist.h"
-#include "ACLRegexData.h"
+#include "acl/RequestMimeType.h"
+#include "acl/Checklist.h"
+#include "acl/RegexData.h"
 
 /* explicit template instantiation required for some systems */
 

diff --git a/src/ACLSourceIP.h b/src/acl/SourceIp.h
similarity index 98%
rename from src/ACLSourceIP.h
rename to src/acl/SourceIp.h
index a3b35dc0c4ac7d92c4f37cb9c99eaf9807df7546..4225f47c37745d20642f1b7699fee6bc36212db5 100644 (file)
--- a/src/ACLSourceIP.h
+++ b/src/acl/SourceIp.h
@@ -34,7 +34,7 @@
 
 #ifndef SQUID_ACLSOURCEIP_H
 #define SQUID_ACLSOURCEIP_H
-#include "ACLIP.h"
+#include "acl/Ip.h"
 
 class ACLSourceIP : public ACLIP
 {

diff --git a/src/ACLSslErrorData.cc b/src/acl/SslErrorData.cc
similarity index 95%
rename from src/ACLSslErrorData.cc
rename to src/acl/SslErrorData.cc
index 2a71d03c30a08f07a21673b936bdf2c241441592..62ddef42ede6c0b76bcd1554b6a81e6adcff30d0 100644 (file)
--- a/src/ACLSslErrorData.cc
+++ b/src/acl/SslErrorData.cc
@@ -3,8 +3,8 @@
  */
 
 #include "squid.h"
-#include "ACLSslErrorData.h"
-#include "ACLChecklist.h"
+#include "acl/SslErrorData.h"
+#include "acl/Checklist.h"
 #include "wordlist.h"
 
 ACLSslErrorData::ACLSslErrorData() : values (NULL)

diff --git a/src/ACLSslErrorData.h b/src/acl/SslErrorData.h
similarity index 93%
rename from src/ACLSslErrorData.h
rename to src/acl/SslErrorData.h
index 7cca7ffeaf883aa075e784af0c9d7c9b19fc1c45..c26e17c383b258998ef31de83412bb5a91b04216 100644 (file)
--- a/src/ACLSslErrorData.h
+++ b/src/acl/SslErrorData.h
@@ -5,8 +5,8 @@
 
 #ifndef SQUID_ACLSSL_ERRORDATA_H
 #define SQUID_ACLSSL_ERRORDATA_H
-#include "ACL.h"
-#include "ACLData.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
 #include "CbDataList.h"
 #include "ssl_support.h"
 

diff --git a/src/ACLStringData.cc b/src/acl/StringData.cc
similarity index 98%
rename from src/ACLStringData.cc
rename to src/acl/StringData.cc
index 2f862a1d2481edd458c49082ea8c71e2e0a6cfd7..fa9265037b9945def9dca5c78c072e6330a65276 100644 (file)
--- a/src/ACLStringData.cc
+++ b/src/acl/StringData.cc
@@ -35,8 +35,8 @@
  */
 
 #include "squid.h"
-#include "ACLStringData.h"
-#include "ACLChecklist.h"
+#include "acl/StringData.h"
+#include "acl/Checklist.h"
 #include "wordlist.h"
 
 

diff --git a/src/ACLStringData.h b/src/acl/StringData.h
similarity index 97%
rename from src/ACLStringData.h
rename to src/acl/StringData.h
index 7fad98c1e3eae9fdee899d4df41d4aadf60e6ea4..587ac27d8c9cfe365360ddc591a3005775fbb2b0 100644 (file)
--- a/src/ACLStringData.h
+++ b/src/acl/StringData.h
@@ -36,8 +36,8 @@
 #ifndef SQUID_ACLSTRINGDATA_H
 #define SQUID_ACLSTRINGDATA_H
 #include "splay.h"
-#include "ACL.h"
-#include "ACLData.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
 
 
 class ACLStringData : public ACLData<char const *>

diff --git a/src/ACLTimeData.cc b/src/acl/TimeData.cc
similarity index 98%
rename from src/ACLTimeData.cc
rename to src/acl/TimeData.cc
index 593995df24b7159c53cc7d3f2b3fdeb5384f3b1c..f05560b169ce47c1e04bf39051dc611f924e5707 100644 (file)
--- a/src/ACLTimeData.cc
+++ b/src/acl/TimeData.cc
@@ -35,9 +35,8 @@
  */
 
 #include "squid.h"
-#include "ACLTimeData.h"
-#include "authenticate.h"
-#include "ACLChecklist.h"
+#include "acl/TimeData.h"
+#include "acl/Checklist.h"
 #include "wordlist.h"
 
 ACLTimeData::ACLTimeData () : weekbits (0), start (0), stop (0), next (NULL) {}

diff --git a/src/ACLTimeData.h b/src/acl/TimeData.h
similarity index 97%
rename from src/ACLTimeData.h
rename to src/acl/TimeData.h
index 6d3e4c3d2159f5c6b18c5b84bc31316d5ddb0e5f..a52eed66e0071f7ec8a9a0321f8542dd996626f8 100644 (file)
--- a/src/ACLTimeData.h
+++ b/src/acl/TimeData.h
@@ -36,8 +36,8 @@
 #ifndef SQUID_ACLTIMEDATA_H
 #define SQUID_ACLTIMEDATA_H
 #include "splay.h"
-#include "ACL.h"
-#include "ACLData.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
 
 class ACLTimeData : public ACLData<time_t>
 {

diff --git a/src/ACLUserData.cc b/src/acl/UserData.cc
similarity index 98%
rename from src/ACLUserData.cc
rename to src/acl/UserData.cc
index 09da42ddc6dd87e6f6869ffded2f8e63f7dea5a1..80df73e35f0a5beaf1cf62c656c41b93c7325b5e 100644 (file)
--- a/src/ACLUserData.cc
+++ b/src/acl/UserData.cc
@@ -35,9 +35,8 @@
  */
 
 #include "squid.h"
-#include "ACLUserData.h"
-#include "authenticate.h"
-#include "ACLChecklist.h"
+#include "acl/UserData.h"
+#include "acl/Checklist.h"
 #include "wordlist.h"
 #include "ConfigParser.h"
 

diff --git a/src/ACLUserData.h b/src/acl/UserData.h
similarity index 97%
rename from src/ACLUserData.h
rename to src/acl/UserData.h
index b0bd11d367ff881c71e00d374856f291465788d1..5631bfb6183922ef5a8458011708404f24d98f9a 100644 (file)
--- a/src/ACLUserData.h
+++ b/src/acl/UserData.h
@@ -36,8 +36,8 @@
 #ifndef SQUID_ACLUSERDATA_H
 #define SQUID_ACLUSERDATA_H
 #include "splay.h"
-#include "ACL.h"
-#include "ACLData.h"
+#include "acl/Acl.h"
+#include "acl/Data.h"
 
 class ACLUserData : public ACLData<char const *>
 {

diff --git a/src/adaptation/AccessRule.cc b/src/adaptation/AccessRule.cc
index d8dbd649dc26ae0b2a71bf6752540aa5bbc5a717..4191c34daacbe0d075c104751d86503f7100517b 100644 (file)
--- a/src/adaptation/AccessRule.cc
+++ b/src/adaptation/AccessRule.cc
@@ -2,7 +2,7 @@
 #include "structs.h"
 
 #include "ConfigParser.h"
-#include "ACL.h"
+#include "acl/Gadgets.h"
 #include "adaptation/AccessRule.h"
 #include "adaptation/Service.h"
 #include "adaptation/ServiceGroups.h"

diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc
index cbc19f2ebd779929e6cb85dd81595a52e4d58288..d2571a4298c192676012e546ef2a954feeaa868c 100644 (file)
--- a/src/adaptation/Config.cc
+++ b/src/adaptation/Config.cc
@@ -34,7 +34,7 @@
 #include "structs.h"
 
 #include "ConfigParser.h"
-#include "ACL.h"
+#include "acl/Gadgets.h"
 #include "Store.h"
 #include "Array.h"    // really Vector
 #include "adaptation/Config.h"

diff --git a/src/authenticate.cc b/src/auth/Gadgets.cc
similarity index 97%
rename from src/authenticate.cc
rename to src/auth/Gadgets.cc
index f3fcbc41fbcaa6f2349ec3e2471875eefd913a5f..2bf51f6725cbaeb1a3be1a3c50136273e496cc17 100644 (file)
--- a/src/authenticate.cc
+++ b/src/auth/Gadgets.cc
@@ -38,12 +38,15 @@
  * See acl.c for access control and client_side.c for auditing */
 
 #include "squid.h"
-#include "authenticate.h"
-#include "ACL.h"
+#include "acl/Acl.h"
+#include "acl/FilledChecklist.h"
 #include "client_side.h"
 #include "auth/Config.h"
 #include "auth/Scheme.h"
+#include "auth/Gadgets.h"
 #include "auth/User.h"
+#include "auth/UserRequest.h"
+#include "auth/AclProxyAuth.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 

diff --git a/src/auth/Scheme.cc b/src/auth/Scheme.cc
index 4d3bf1cb07867e58ab985b8fba49536284df3698..764a7c06194b43622394c30622327eb1e18cbbb5 100644 (file)
--- a/src/auth/Scheme.cc
+++ b/src/auth/Scheme.cc
@@ -36,7 +36,7 @@
 
 #include "squid.h"
 #include "auth/Scheme.h"
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "auth/Config.h"
 
 Vector<AuthScheme*> *AuthScheme::_Schemes = NULL;

diff --git a/src/auth/User.cc b/src/auth/User.cc
index f0ce00f49ed0deebe4dd3feaa52ef5e6b8999aa8..71094e1c0653ab20992a29561cdb52f0d2f573f5 100644 (file)
--- a/src/auth/User.cc
+++ b/src/auth/User.cc
@@ -37,8 +37,9 @@
 #include "auth/User.h"
 #include "auth/UserRequest.h"
 #include "auth/Config.h"
-#include "authenticate.h"
-#include "ACL.h"
+#include "auth/Gadgets.h"
+#include "acl/Acl.h"
+#include "acl/Gadgets.h"
 #include "event.h"
 #include "SquidTime.h"
 

diff --git a/src/auth/UserRequest.cc b/src/auth/UserRequest.cc
index 69423e2feccc97d1446b85138d58e8979fdb4bbb..285e19c70677b6be02800319b4a806f43a3a40fe 100644 (file)
--- a/src/auth/UserRequest.cc
+++ b/src/auth/UserRequest.cc
@@ -43,8 +43,8 @@
 #include "squid.h"
 #include "auth/UserRequest.h"
 #include "auth/User.h"
-/*#include "authenticate.h"
-#include "ACL.h"
+/*#include "auth/Gadgets.h"
+#include "acl/Acl.h"
 #include "client_side.h"
 */
 #include "auth/Config.h"

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index b40b02ee1a9a335c540bbd5a157593007f0bcdbf..4fdee3b5250110ecfb80ebf2d05df51db18dce1f 100644 (file)
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -39,7 +39,7 @@
 
 #include "squid.h"
 #include "auth_basic.h"
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "CacheManager.h"
 #include "Store.h"
 #include "HttpReply.h"

diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h
index 81c512f33e4306f715508b209d5331c32ae7dfda..3e5161687c9fad686e91f4549fd6e4e7346f4359 100644 (file)
--- a/src/auth/basic/auth_basic.h
+++ b/src/auth/basic/auth_basic.h
@@ -5,7 +5,7 @@
 
 #ifndef __AUTH_BASIC_H__
 #define __AUTH_BASIC_H__
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "auth/User.h"
 #include "auth/UserRequest.h"
 #include "auth/Config.h"

diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index af8a3bde852802bc1a507c79851b2667619d6863..46041ba7755bf901135223e9f6cf6a2968afe38a 100644 (file)
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -40,7 +40,7 @@
 #include "squid.h"
 #include "rfc2617.h"
 #include "auth_digest.h"
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "event.h"
 #include "CacheManager.h"
 #include "Store.h"

diff --git a/src/auth/digest/auth_digest.h b/src/auth/digest/auth_digest.h
index b8656d3d6fd7b99caa1016ab2346d6a7a63c8fb3..5b0b512089f5d312303362992568ecd4981e099f 100644 (file)
--- a/src/auth/digest/auth_digest.h
+++ b/src/auth/digest/auth_digest.h
@@ -6,7 +6,7 @@
 #ifndef __AUTH_DIGEST_H__
 #define __AUTH_DIGEST_H__
 #include "rfc2617.h"
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "auth/User.h"
 #include "auth/UserRequest.h"
 #include "auth/Config.h"

diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index 92e84ac189cb89985e3701971c85db68bfc0ac15..2d78603c070b37eb54431f61e6a4e7a0d1690a70 100644 (file)
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -39,7 +39,7 @@
 
 #include "squid.h"
 #include "auth_negotiate.h"
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "CacheManager.h"
 #include "Store.h"
 #include "client_side.h"

diff --git a/src/auth/negotiate/auth_negotiate.h b/src/auth/negotiate/auth_negotiate.h
index 2d38b61cd4b0def6fc978f5a56f2cf0e3759fff7..b3888c4b5a96f182beb61540c8aae3aa31761de2 100644 (file)
--- a/src/auth/negotiate/auth_negotiate.h
+++ b/src/auth/negotiate/auth_negotiate.h
@@ -5,7 +5,7 @@
 
 #ifndef __AUTH_NEGOTIATE_H__
 #define __AUTH_NEGOTIATE_H__
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "auth/User.h"
 #include "auth/UserRequest.h"
 #include "auth/Config.h"

diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index 7d33066a637b73179fb18c674dae1334a47625b6..6a58c16e5f31822261dc0712813a3c8874bcde86 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -39,7 +39,7 @@
 
 #include "squid.h"
 #include "auth_ntlm.h"
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "CacheManager.h"
 #include "Store.h"
 #include "client_side.h"

diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h
index 97239a4e221cf2fe9efd7dba4670189cba13258c..ebe95253ad143ebc060967b372fc5e5f7044e4e9 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.h
+++ b/src/auth/ntlm/auth_ntlm.h
@@ -5,7 +5,7 @@
 
 #ifndef __AUTH_NTLM_H__
 #define __AUTH_NTLM_H__
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "auth/User.h"
 #include "auth/UserRequest.h"
 #include "auth/Config.h"

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 66cd44d480baa8edca6f05cc6075deb2e36acec1..ca93ed34ae08f8b40386020134604ce96435f06b 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -33,7 +33,6 @@
  */
 
 #include "squid.h"
-#include "authenticate.h"
 #include "ProtoPort.h"
 #include "HttpRequestMethod.h"
 #include "auth/Config.h"
@@ -42,7 +41,8 @@
 #include "Store.h"
 #include "SwapDir.h"
 #include "ConfigParser.h"
-#include "ACL.h"
+#include "acl/Acl.h"
+#include "acl/Gadgets.h"
 #include "StoreFileSystem.h"
 #include "Parsing.h"
 #include "MemBuf.h"

diff --git a/src/main.cc b/src/main.cc
index c9672b44634819d81882db76673e28e22fbb170b..d02d90e0ab754337264df26a4cc6008829741c60 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -34,7 +34,7 @@
 
 #include "squid.h"
 #include "AccessLogEntry.h"
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "ConfigParser.h"
 #include "errorpage.h"
 #include "event.h"
@@ -46,8 +46,8 @@
 #include "HttpReply.h"
 #include "pconn.h"
 #include "Mem.h"
-#include "ACLASN.h"
-#include "ACL.h"
+#include "acl/Asn.h"
+#include "acl/Acl.h"
 #include "htcp.h"
 #include "StoreFileSystem.h"
 #include "DiskIO/DiskIOModule.h"

diff --git a/src/redirect.cc b/src/redirect.cc
index cff7013bb2ea46c517f94102f8ce95eb894119e4..93fe7d43c89a47d299359e18be5031502c909ca6 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -39,7 +39,7 @@
 #include "Store.h"
 #include "fde.h"
 #include "client_side_request.h"
-#include "ACLChecklist.h"
+#include "acl/Checklist.h"
 #include "HttpRequest.h"
 #include "client_side.h"
 #include "helper.h"

diff --git a/src/tests/testACLMaxUserIP.cc b/src/tests/testACLMaxUserIP.cc
index 7ff1e6cbc9904466fb90f555f7c9ee49b7e43c09..bd286da28d19419cb2938005f3d2e5d156e0a328 100644 (file)
--- a/src/tests/testACLMaxUserIP.cc
+++ b/src/tests/testACLMaxUserIP.cc
@@ -4,7 +4,7 @@
 #include <stdexcept>
 
 #include "testACLMaxUserIP.h"
-#include "ACLMaxUserIP.h"
+#include "auth/AclMaxUserIp.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testACLMaxUserIP );
 

diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc
index 707fa58fe54965d115b6bd001e28f52c893fcfcc..55ca2112852648cb6e9c3c07dcb8af39330ac474 100644 (file)
--- a/src/tests/testAuth.cc
+++ b/src/tests/testAuth.cc
@@ -2,7 +2,7 @@
 
 #include "squid.h"
 #include "testAuth.h"
-#include "authenticate.h"
+#include "auth/Gadgets.h"
 #include "auth/UserRequest.h"
 #include "auth/Scheme.h"
 #include "auth/Config.h"

diff --git a/src/tests/test_http_range.cc b/src/tests/test_http_range.cc
index e44f1f2408c6e17642c381e82938483f3509227f..d9b8df69fd8d3460bbf7f3534f080fe906b4a7db 100644 (file)
--- a/src/tests/test_http_range.cc
+++ b/src/tests/test_http_range.cc
@@ -45,7 +45,7 @@
 #include "Mem.h"
 
 #if 0
-#include "ACLChecklist.h"
+#include "acl/Checklist.h"
 #endif
 
 /* Stub routines */