From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Wed, 25 Mar 2009 11:46:09 +0000 (+0200)
Subject: Move registration code of max_user_ip, proxy_auth and proxy_auth_regex
X-Git-Tag: SQUID_3_2_0_1~1100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abca32cfc0194f2edd3405cbd566880eb8115141;p=thirdparty%2Fsquid.git

Move registration code of max_user_ip, proxy_auth and proxy_auth_regex
acls from src/auth/Acl*  into the src/AclRegs.cc
---

diff --git a/src/AclRegs.cc b/src/AclRegs.cc
index 85c8b260ca..39fc678ded 100644
--- a/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@ -62,6 +62,9 @@
 #include "acl/UrlPath.h"
 #include "acl/UrlPort.h"
 #include "acl/UserData.h"
+#include "auth/AclProxyAuth.h"
+#include "auth/AclMaxUserIp.h"
+
 
 ACL::Prototype ACLBrowser::RegistryProtoype(&ACLBrowser::RegistryEntry_, "browser");
 ACLStrategised<char const *> ACLBrowser::RegistryEntry_(new ACLRegexData, ACLRequestHeaderStrategy<HDR_USER_AGENT>::Instance(), "browser");
@@ -139,4 +142,10 @@ ACLStrategised<int> ACLUrlPort::RegistryEntry_(new ACLIntRange, ACLUrlPortStrate
 #endif
 
 
+ACL::Prototype ACLProxyAuth::UserRegistryProtoype(&ACLProxyAuth::UserRegistryEntry_, "proxy_auth");
+ACLProxyAuth ACLProxyAuth::UserRegistryEntry_(new ACLUserData, "proxy_auth");
+ACL::Prototype ACLProxyAuth::RegexRegistryProtoype(&ACLProxyAuth::RegexRegistryEntry_, "proxy_auth_regex" );
+ACLProxyAuth ACLProxyAuth::RegexRegistryEntry_(new ACLRegexData, "proxy_auth_regex");
 
+ACL::Prototype ACLMaxUserIP::RegistryProtoype(&ACLMaxUserIP::RegistryEntry_, "max_user_ip");
+ACLMaxUserIP ACLMaxUserIP::RegistryEntry_("max_user_ip");
diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc
index 0326b8feb4..881ea82fce 100644
--- a/src/auth/AclMaxUserIp.cc
+++ b/src/auth/AclMaxUserIp.cc
@@ -42,10 +42,6 @@
 #include "wordlist.h"
 #include "ConfigParser.h"
 
-ACL::Prototype ACLMaxUserIP::RegistryProtoype(&ACLMaxUserIP::RegistryEntry_, "max_user_ip");
-
-ACLMaxUserIP ACLMaxUserIP::RegistryEntry_("max_user_ip");
-
 ACL *
 ACLMaxUserIP::clone() const
 {
diff --git a/src/auth/AclProxyAuth.cc b/src/auth/AclProxyAuth.cc
index d4b5748544..8a3ea72fd7 100644
--- a/src/auth/AclProxyAuth.cc
+++ b/src/auth/AclProxyAuth.cc
@@ -190,11 +190,6 @@ ProxyAuthNeeded::checkForAsync(ACLChecklist *checklist) const
     checklist->markFinished();
 }
 
-ACL::Prototype ACLProxyAuth::UserRegistryProtoype(&ACLProxyAuth::UserRegistryEntry_, "proxy_auth");
-ACLProxyAuth ACLProxyAuth::UserRegistryEntry_(new ACLUserData, "proxy_auth");
-ACL::Prototype ACLProxyAuth::RegexRegistryProtoype(&ACLProxyAuth::RegexRegistryEntry_, "proxy_auth_regex" );
-ACLProxyAuth ACLProxyAuth::RegexRegistryEntry_(new ACLRegexData, "proxy_auth_regex");
-
 ACL *
 ACLProxyAuth::clone() const
 {