From: Alex Rousskov Date: Tue, 24 Feb 2009 23:52:44 +0000 (-0700) Subject: SourceLayout: src/auth, take 0 X-Git-Tag: SQUID_3_2_0_1~1154^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d2b0bb74692cd9542750915021fc1cee26efa8b;p=thirdparty%2Fsquid.git SourceLayout: src/auth, take 0 Moved src/AuthFoo* to src/auth/Foo* All auth libraries are built in auth/ now. Simplified and documented AUTH_* autotools variables. Auth sources are no longer added to executables directly. TODO: Add Makefiles to specific auth modules. TODO: Add Auth namespace and rename auth classes accordingnly. These changes were triggered by a yet unfinished attempt to make "make distclean" work. --- diff --git a/configure.in b/configure.in index ff81f6af82..29c162313d 100644 --- a/configure.in +++ b/configure.in @@ -1563,19 +1563,22 @@ if test -n "$AUTH_MODULES"; then eval AUTH_MODULE_${module}=yes done AC_MSG_NOTICE([Auth scheme modules built: $AUTH_MODULES]) - AUTH_OBJS="auth/lib`echo $AUTH_MODULES|sed -e 's% %.a auth/lib%g'`.a" - AUTH_LIBS="`echo $AUTH_OBJS|sed -e 's%auth/%%g'`" else AC_MSG_WARN([Auth scheme modules built: None]) fi -AUTH_LINKOBJS= +dnl Authentication libraries to build +dnl This list will not be needed when each auth library has its own Makefile +AUTH_LIBS_TO_BUILD= +dnl Authentication libraries to link authenticating executables with. +dnl These are the same as AUTH_LIBS_TO_BUILD, but with a path +AUTH_LIBS_TO_ADD= for module in $AUTH_MODULES; do - AUTH_LINKOBJS="$AUTH_LINKOBJS auth/${module}/${module}Scheme.o" + AUTH_LIBS_TO_BUILD="$AUTH_LIBS_TO_BUILD lib${module}.a" + AUTH_LIBS_TO_ADD="$AUTH_LIBS_TO_ADD auth/lib${module}.a" done AC_SUBST(AUTH_MODULES) -AC_SUBST(AUTH_LIBS) -AC_SUBST(AUTH_LINKOBJS) -AC_SUBST(AUTH_OBJS) +AC_SUBST(AUTH_LIBS_TO_ADD) +AC_SUBST(AUTH_LIBS_TO_BUILD) dnl bundled auth modules, in order to have handy defines for the cppunit testsuite test -n "$AUTH_MODULE_basic" && AC_DEFINE([HAVE_AUTH_MODULE_BASIC],1,[Basic auth module is built]) diff --git a/src/ACLChecklist.cc b/src/ACLChecklist.cc index 33b317e31c..4811f5cd48 100644 --- a/src/ACLChecklist.cc +++ b/src/ACLChecklist.cc @@ -40,7 +40,7 @@ #include "authenticate.h" #include "ACLProxyAuth.h" #include "client_side.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" int ACLChecklist::authenticated() diff --git a/src/ACLMaxUserIP.cc b/src/ACLMaxUserIP.cc index 4d561a385f..31aafc4212 100644 --- a/src/ACLMaxUserIP.cc +++ b/src/ACLMaxUserIP.cc @@ -36,7 +36,7 @@ #include "squid.h" #include "ACLMaxUserIP.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #include "authenticate.h" #include "wordlist.h" #include "ConfigParser.h" diff --git a/src/ACLProxyAuth.cc b/src/ACLProxyAuth.cc index 312d908acb..e8643cd38b 100644 --- a/src/ACLProxyAuth.cc +++ b/src/ACLProxyAuth.cc @@ -42,8 +42,8 @@ #include "ACLRegexData.h" #include "client_side.h" #include "HttpRequest.h" -#include "AuthUser.h" -#include "AuthUserRequest.h" +#include "auth/User.h" +#include "auth/UserRequest.h" ACLProxyAuth::~ACLProxyAuth() { diff --git a/src/DelayUser.cc b/src/DelayUser.cc index d32b5f2186..9ddbe4d1dd 100644 --- a/src/DelayUser.cc +++ b/src/DelayUser.cc @@ -40,8 +40,8 @@ #if DELAY_POOLS #include "squid.h" #include "DelayUser.h" -#include "AuthUserRequest.h" -#include "AuthUser.h" +#include "auth/UserRequest.h" +#include "auth/User.h" #include "NullDelayId.h" #include "Store.h" diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index b27814e670..1f80874d41 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -36,7 +36,7 @@ #include "squid.h" #include "HttpRequest.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #include "HttpHeaderRange.h" #include "MemBuf.h" #include "Store.h" diff --git a/src/ICAP/ICAPModXact.cc b/src/ICAP/ICAPModXact.cc index 06cd1138e1..c45b898da7 100644 --- a/src/ICAP/ICAPModXact.cc +++ b/src/ICAP/ICAPModXact.cc @@ -14,7 +14,7 @@ #include "ICAPClient.h" #include "ChunkedCodingParser.h" #include "TextException.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #include "ICAPConfig.h" #include "SquidTime.h" diff --git a/src/Makefile.am b/src/Makefile.am index 239fe53746..793d2c8514 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -208,12 +208,12 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@ EXTRA_LIBRARIES = libAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a noinst_LIBRARIES = @DISK_LIBS@ -noinst_LTLIBRARIES = libsquid.la libauth.la +noinst_LTLIBRARIES = libsquid.la # libraries used by many targets COMMON_LIBS = \ libsquid.la \ - libauth.la \ + auth/libauth.a \ base/libbase.la \ ip/libip.la @@ -289,16 +289,6 @@ DiskIO/DiskIOModules_gen.cc: Makefile $(SHELL) $(srcdir)/DiskIO/modules.sh $(DISK_MODULES) > DiskIO/DiskIOModules_gen.cc -all_AUTHMODULES = \ - auth/basic/basicScheme.cc \ - auth/basic/basicScheme.h \ - auth/digest/digestScheme.cc \ - auth/digest/digestScheme.h \ - auth/ntlm/ntlmScheme.cc \ - auth/ntlm/ntlmScheme.h \ - auth/negotiate/negotiateScheme.cc \ - auth/negotiate/negotiateScheme.h - EXTRA_squid_SOURCES = \ $(all_FSMODULES) \ $(AIO_WIN32_ALL_SOURCES) \ @@ -435,15 +425,6 @@ libsquid_la_SOURCES = \ TextException.cc \ TextException.h -# authentication framework -libauth_la_SOURCES = \ - AuthConfig.cc \ - AuthConfig.h \ - AuthScheme.cc \ - AuthScheme.h \ - AuthUser.cc \ - AuthUserRequest.cc - squid_SOURCES = \ access_log.cc \ AccessLogEntry.h \ @@ -672,9 +653,6 @@ squid_SOURCES = \ $(WINSVC_SOURCE) noinst_HEADERS = ACLChecklist.cci \ - AuthUser.cci \ - AuthUser.h \ - AuthUserRequest.h \ client_side_request.cci \ MemBuf.cci \ MemBuf.h \ @@ -701,8 +679,7 @@ squid_LDADD = \ @STORE_LINKOBJS@ \ @STORE_OBJS@ \ @DISK_LIBS@ \ - @AUTH_LINKOBJS@ \ - @AUTH_OBJS@ \ + @AUTH_LIBS_TO_ADD@ \ @CRYPTLIB@ \ @REGEXLIB@ \ @SNMPLIB@ \ @@ -718,8 +695,7 @@ squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @DISK_LIBS@ \ @DISK_LINKOBJS@ \ @REPL_OBJS@ \ - @AUTH_LINKOBJS@ \ - @AUTH_OBJS@ + @AUTH_LIBS_TO_ADD@ if USE_LOADABLE_MODULES squid_SOURCES += $(LOADABLE_MODULES_SOURCES) @@ -921,7 +897,7 @@ ufsdump_LDADD = \ @XTRA_OBJS@ \ @REPL_OBJS@ \ @STORE_OBJS@ \ - @AUTH_OBJS@ \ + @AUTH_LIBS_TO_ADD@ \ @CRYPTLIB@ \ @REGEXLIB@ \ @SNMPLIB@ \ @@ -937,8 +913,7 @@ ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @DISK_LIBS@ \ @DISK_LINKOBJS@ \ @REPL_OBJS@ \ - @AUTH_LINKOBJS@ \ - @AUTH_OBJS@ + @AUTH_LIBS_TO_ADD@ nodist_ufsdump_SOURCES = \ repl_modules.cc \ @@ -1245,15 +1220,14 @@ nodist_tests_testAuth_SOURCES = \ tests_testAuth_LDADD= \ $(COMMON_LIBS) \ - @AUTH_LINKOBJS@ @AUTH_OBJS@ \ + @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_LINKOBJS@ \ - @AUTH_OBJS@ \ + @AUTH_LIBS_TO_ADD@ \ @SQUID_CPPUNIT_LA@ ## Tests for the ACLMaxUserIP class diff --git a/src/AuthConfig.cc b/src/auth/Config.cc similarity index 98% rename from src/AuthConfig.cc rename to src/auth/Config.cc index bcfbf7f6fc..0b4beb0862 100644 --- a/src/AuthConfig.cc +++ b/src/auth/Config.cc @@ -34,8 +34,8 @@ */ #include "squid.h" -#include "AuthConfig.h" -#include "AuthUserRequest.h" +#include "auth/Config.h" +#include "auth/UserRequest.h" /* Get Auth User: Return a filled out auth_user structure for the given * Proxy Auth (or Auth) header. It may be a cached Auth User or a new diff --git a/src/AuthConfig.h b/src/auth/Config.h similarity index 100% rename from src/AuthConfig.h rename to src/auth/Config.h diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am index 70749bc172..835b3cbc39 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -1,37 +1,59 @@ -# Makefile for authentication modules in the Squid Object Cache server -# -# $Id$ -# -AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = @SQUID_CFLAGS@ -AM_CXXFLAGS = @SQUID_CXXFLAGS@ -CLEANFILES = +include $(top_srcdir)/src/Common.am EXTRA_LIBRARIES = libbasic.a libdigest.a libntlm.a libnegotiate.a -noinst_LIBRARIES = @AUTH_LIBS@ +noinst_LIBRARIES = libauth.a @AUTH_LIBS_TO_BUILD@ -libbasic_a_SOURCES = basic/auth_basic.cc basic/auth_basic.h -libdigest_a_SOURCES = digest/auth_digest.cc digest/auth_digest.h -libntlm_a_SOURCES = ntlm/auth_ntlm.cc ntlm/auth_ntlm.h -libnegotiate_a_SOURCES = negotiate/auth_negotiate.cc negotiate/auth_negotiate.h negotiate/negotiateScheme.cc negotiate/negotiateScheme.h +## authentication framework; this library is always built +## TODO: use libtool and add @AUTH_LIBS_TO_BUILD@ to libauth.la +libauth_a_SOURCES = \ + Config.cc \ + Config.h \ + Scheme.cc \ + Scheme.h \ + User.h \ + User.cci \ + User.cc \ + UserRequest.h \ + UserRequest.cc -INCLUDES = \ - -I$(top_srcdir) \ - -I. \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src +libbasic_a_SOURCES = \ + basic/basicScheme.cc \ + basic/basicScheme.h \ + basic/auth_basic.cc \ + basic/auth_basic.h -check_PROGRAMS= testHeaders +libdigest_a_SOURCES = \ + digest/digestScheme.cc \ + digest/digestScheme.h \ + digest/auth_digest.cc \ + digest/auth_digest.h + +libntlm_a_SOURCES = \ + ntlm/ntlmScheme.cc \ + ntlm/ntlmScheme.h \ + ntlm/auth_ntlm.cc \ + ntlm/auth_ntlm.h + +libnegotiate_a_SOURCES = \ + negotiate/negotiateScheme.cc \ + negotiate/negotiateScheme.h \ + negotiate/auth_negotiate.cc \ + negotiate/auth_negotiate.h + +# TODO: fix #include statements so that this is not needed +INCLUDES += -I. + + +check_PROGRAMS += testHeaders ## Special Universal .h dependency test script ## aborts if error encountered -testHeaders: $(top_srcdir)/src/auth/basic/*.h $(top_srcdir)/src/auth/digest/*.h $(top_srcdir)/src/auth/ntlm/*.h $(top_srcdir)/src/auth/negotiate/*.h +testHeaders: $(top_srcdir)/src/auth/*.h $(top_srcdir)/src/auth/basic/*.h $(top_srcdir)/src/auth/digest/*.h $(top_srcdir)/src/auth/ntlm/*.h $(top_srcdir)/src/auth/negotiate/*.h + $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1 $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "basic" || exit 1 $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "digest" || exit 1 $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "ntlm" || exit 1 $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "negotiate" || exit 1 -## ./ has no .h files ## No such file... testHeaders.c: diff --git a/src/AuthScheme.cc b/src/auth/Scheme.cc similarity index 98% rename from src/AuthScheme.cc rename to src/auth/Scheme.cc index 55699f545e..4d3bf1cb07 100644 --- a/src/AuthScheme.cc +++ b/src/auth/Scheme.cc @@ -35,9 +35,9 @@ */ #include "squid.h" -#include "AuthScheme.h" +#include "auth/Scheme.h" #include "authenticate.h" -#include "AuthConfig.h" +#include "auth/Config.h" Vector *AuthScheme::_Schemes = NULL; diff --git a/src/AuthScheme.h b/src/auth/Scheme.h similarity index 100% rename from src/AuthScheme.h rename to src/auth/Scheme.h diff --git a/src/AuthUser.cc b/src/auth/User.cc similarity index 99% rename from src/AuthUser.cc rename to src/auth/User.cc index c8a47ef98f..f0ce00f49e 100644 --- a/src/AuthUser.cc +++ b/src/auth/User.cc @@ -34,16 +34,16 @@ */ #include "squid.h" -#include "AuthUser.h" -#include "AuthUserRequest.h" -#include "AuthConfig.h" +#include "auth/User.h" +#include "auth/UserRequest.h" +#include "auth/Config.h" #include "authenticate.h" #include "ACL.h" #include "event.h" #include "SquidTime.h" #ifndef _USE_INLINE_ -#include "AuthUser.cci" +#include "auth/User.cci" #endif // This should be converted into a pooled type. Does not need to be cbdata diff --git a/src/AuthUser.cci b/src/auth/User.cci similarity index 100% rename from src/AuthUser.cci rename to src/auth/User.cci diff --git a/src/AuthUser.h b/src/auth/User.h similarity index 99% rename from src/AuthUser.h rename to src/auth/User.h index 56f00eeca4..47a99337e9 100644 --- a/src/AuthUser.h +++ b/src/auth/User.h @@ -112,7 +112,7 @@ private: }; #ifdef _USE_INLINE_ -#include "AuthUser.cci" +#include "auth/User.cci" #endif #endif /* SQUID_AUTHUSER_H */ diff --git a/src/AuthUserRequest.cc b/src/auth/UserRequest.cc similarity index 99% rename from src/AuthUserRequest.cc rename to src/auth/UserRequest.cc index 1343427dc3..69423e2fec 100644 --- a/src/AuthUserRequest.cc +++ b/src/auth/UserRequest.cc @@ -41,14 +41,14 @@ * See acl.c for access control and client_side.c for auditing */ #include "squid.h" -#include "AuthUserRequest.h" -#include "AuthUser.h" +#include "auth/UserRequest.h" +#include "auth/User.h" /*#include "authenticate.h" #include "ACL.h" #include "client_side.h" */ -#include "AuthConfig.h" -#include "AuthScheme.h" +#include "auth/Config.h" +#include "auth/Scheme.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/AuthUserRequest.h b/src/auth/UserRequest.h similarity index 100% rename from src/AuthUserRequest.h rename to src/auth/UserRequest.h diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h index 8907885bec..81c512f33e 100644 --- a/src/auth/basic/auth_basic.h +++ b/src/auth/basic/auth_basic.h @@ -6,9 +6,9 @@ #ifndef __AUTH_BASIC_H__ #define __AUTH_BASIC_H__ #include "authenticate.h" -#include "AuthUser.h" -#include "AuthUserRequest.h" -#include "AuthConfig.h" +#include "auth/User.h" +#include "auth/UserRequest.h" +#include "auth/Config.h" #include "helper.h" #define DefaultAuthenticateChildrenMax 32 /* 32 processes */ diff --git a/src/auth/basic/basicScheme.h b/src/auth/basic/basicScheme.h index a0884994f6..f431b10154 100644 --- a/src/auth/basic/basicScheme.h +++ b/src/auth/basic/basicScheme.h @@ -34,7 +34,7 @@ #ifndef SQUID_BASICSCHEME_H #define SQUID_BASICSCHEME_H -#include "AuthScheme.h" +#include "auth/Scheme.h" /// \ingroup AuthAPI /// \ingroup AuthSchemeAPI diff --git a/src/auth/digest/auth_digest.h b/src/auth/digest/auth_digest.h index 74fce505a0..b8656d3d6f 100644 --- a/src/auth/digest/auth_digest.h +++ b/src/auth/digest/auth_digest.h @@ -7,9 +7,9 @@ #define __AUTH_DIGEST_H__ #include "rfc2617.h" #include "authenticate.h" -#include "AuthUser.h" -#include "AuthUserRequest.h" -#include "AuthConfig.h" +#include "auth/User.h" +#include "auth/UserRequest.h" +#include "auth/Config.h" #include "helper.h" /* Generic */ diff --git a/src/auth/digest/digestScheme.h b/src/auth/digest/digestScheme.h index 941d4ffc29..156044fe79 100644 --- a/src/auth/digest/digestScheme.h +++ b/src/auth/digest/digestScheme.h @@ -34,7 +34,7 @@ #ifndef SQUID_DIGESTSCHEME_H #define SQUID_DIGESTSCHEME_H -#include "AuthScheme.h" +#include "auth/Scheme.h" /// \ingroup AuthSchemeAPI /// \ingroup AuthAPI diff --git a/src/auth/negotiate/auth_negotiate.h b/src/auth/negotiate/auth_negotiate.h index 8f32e78213..2d38b61cd4 100644 --- a/src/auth/negotiate/auth_negotiate.h +++ b/src/auth/negotiate/auth_negotiate.h @@ -6,9 +6,9 @@ #ifndef __AUTH_NEGOTIATE_H__ #define __AUTH_NEGOTIATE_H__ #include "authenticate.h" -#include "AuthUser.h" -#include "AuthUserRequest.h" -#include "AuthConfig.h" +#include "auth/User.h" +#include "auth/UserRequest.h" +#include "auth/Config.h" #include "helper.h" /** diff --git a/src/auth/negotiate/negotiateScheme.h b/src/auth/negotiate/negotiateScheme.h index 6abbdc5fd6..8923683f9c 100644 --- a/src/auth/negotiate/negotiateScheme.h +++ b/src/auth/negotiate/negotiateScheme.h @@ -34,7 +34,7 @@ #ifndef SQUID_NEGOTIATESCHEME_H #define SQUID_NEGOTIATESCHEME_H -#include "AuthScheme.h" +#include "auth/Scheme.h" /// \ingroup AuthSchemeAPI /// \ingroup AuthAPI diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h index 684d21f280..97239a4e22 100644 --- a/src/auth/ntlm/auth_ntlm.h +++ b/src/auth/ntlm/auth_ntlm.h @@ -6,9 +6,9 @@ #ifndef __AUTH_NTLM_H__ #define __AUTH_NTLM_H__ #include "authenticate.h" -#include "AuthUser.h" -#include "AuthUserRequest.h" -#include "AuthConfig.h" +#include "auth/User.h" +#include "auth/UserRequest.h" +#include "auth/Config.h" #include "helper.h" #define DefaultAuthenticateChildrenMax 32 /* 32 processes */ diff --git a/src/auth/ntlm/ntlmScheme.h b/src/auth/ntlm/ntlmScheme.h index 9af2f3a859..94f10a9b33 100644 --- a/src/auth/ntlm/ntlmScheme.h +++ b/src/auth/ntlm/ntlmScheme.h @@ -34,7 +34,7 @@ #ifndef SQUID_NTLMSCHEME_H #define SQUID_NTLMSCHEME_H -#include "AuthScheme.h" +#include "auth/Scheme.h" /// \ingroup AuthSchemeAPI /// \ingroup AuthAPI diff --git a/src/authenticate.cc b/src/authenticate.cc index 4676201ac3..f3fcbc41fb 100644 --- a/src/authenticate.cc +++ b/src/authenticate.cc @@ -41,9 +41,9 @@ #include "authenticate.h" #include "ACL.h" #include "client_side.h" -#include "AuthConfig.h" -#include "AuthScheme.h" -#include "AuthUser.h" +#include "auth/Config.h" +#include "auth/Scheme.h" +#include "auth/User.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 661f41ca26..cbf2f347db 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -36,8 +36,8 @@ #include "authenticate.h" #include "ProtoPort.h" #include "HttpRequestMethod.h" -#include "AuthConfig.h" -#include "AuthScheme.h" +#include "auth/Config.h" +#include "auth/Scheme.h" #include "CacheManager.h" #include "Store.h" #include "SwapDir.h" diff --git a/src/client_side.cc b/src/client_side.cc index e91d70d0c5..4934d55126 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -85,7 +85,7 @@ #include "client_side.h" #include "clientStream.h" #include "ProtoPort.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #include "Store.h" #include "comm.h" #include "HttpHdrContRange.h" diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index fc024c596f..277a215ff7 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -46,7 +46,7 @@ #include "HttpRequest.h" #include "forward.h" #include "clientStream.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #if USE_SQUID_ESI #include "ESI.h" #endif diff --git a/src/client_side_request.cc b/src/client_side_request.cc index 781e7dcab3..f59e386162 100644 --- a/src/client_side_request.cc +++ b/src/client_side_request.cc @@ -45,7 +45,7 @@ #include "squid.h" #include "clientStream.h" #include "client_side_request.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #include "HttpRequest.h" #include "ProtoPort.h" #include "ACLChecklist.h" diff --git a/src/errorpage.cc b/src/errorpage.cc index 026500a343..02d41d7462 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -35,7 +35,7 @@ #include "config.h" #include "errorpage.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #include "SquidTime.h" #include "Store.h" #include "HttpReply.h" diff --git a/src/external_acl.cc b/src/external_acl.cc index 7adc8f610b..7948822189 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc @@ -44,7 +44,7 @@ #include "CacheManager.h" #include "ExternalACL.h" #include "ExternalACLEntry.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #include "SquidTime.h" #include "Store.h" #include "fde.h" diff --git a/src/http.cc b/src/http.cc index c2f3767723..69157b40d9 100644 --- a/src/http.cc +++ b/src/http.cc @@ -42,7 +42,7 @@ #include "errorpage.h" #include "MemBuf.h" #include "http.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #include "Store.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/peer_userhash.cc b/src/peer_userhash.cc index 9572805472..5d4255ff0c 100644 --- a/src/peer_userhash.cc +++ b/src/peer_userhash.cc @@ -38,7 +38,7 @@ #include "CacheManager.h" #include "Store.h" #include "HttpRequest.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) diff --git a/src/redirect.cc b/src/redirect.cc index 6d9ad53ac9..cff7013bb2 100644 --- a/src/redirect.cc +++ b/src/redirect.cc @@ -34,7 +34,7 @@ */ #include "squid.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #include "CacheManager.h" #include "Store.h" #include "fde.h" diff --git a/src/stat.cc b/src/stat.cc index a7013901b1..9bc2200ad3 100644 --- a/src/stat.cc +++ b/src/stat.cc @@ -35,7 +35,7 @@ #include "squid.h" #include "event.h" #include "StoreClient.h" -#include "AuthUserRequest.h" +#include "auth/UserRequest.h" #include "CacheManager.h" #include "Store.h" #include "HttpRequest.h" diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc index 00003b7ed7..707fa58fe5 100644 --- a/src/tests/testAuth.cc +++ b/src/tests/testAuth.cc @@ -3,9 +3,9 @@ #include "squid.h" #include "testAuth.h" #include "authenticate.h" -#include "AuthUserRequest.h" -#include "AuthScheme.h" -#include "AuthConfig.h" +#include "auth/UserRequest.h" +#include "auth/Scheme.h" +#include "auth/Config.h" #include "Mem.h" CPPUNIT_TEST_SUITE_REGISTRATION( testAuth );