From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 19 Dec 2016 14:06:15 +0000 (+1300)
Subject: Run source maintenance
X-Git-Tag: M-staged-PR71~333^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae57809946fdfdc3bfca3c2115feaf8a3ac25baa;p=thirdparty%2Fsquid.git

Run source maintenance
---

diff --git a/src/auth/Config.cc b/src/auth/Config.cc
index 2760f08d65..229ede3608 100644
--- a/src/auth/Config.cc
+++ b/src/auth/Config.cc
@@ -13,3 +13,4 @@
 #include "auth/Config.h"
 
 Auth::Config Auth::TheConfig;
+
diff --git a/src/auth/Scheme.cc b/src/auth/Scheme.cc
index 268eaaba95..a7b2794adb 100644
--- a/src/auth/Scheme.cc
+++ b/src/auth/Scheme.cc
@@ -9,9 +9,9 @@
 /* DEBUG: section 29    Authenticator */
 
 #include "squid.h"
-#include "auth/SchemeConfig.h"
 #include "auth/Gadgets.h"
 #include "auth/Scheme.h"
+#include "auth/SchemeConfig.h"
 #include "globals.h"
 
 std::vector<Auth::Scheme::Pointer> *Auth::Scheme::_Schemes = NULL;
diff --git a/src/auth/User.cc b/src/auth/User.cc
index 53528537ce..279f648c37 100644
--- a/src/auth/User.cc
+++ b/src/auth/User.cc
@@ -11,9 +11,9 @@
 #include "squid.h"
 #include "acl/Acl.h"
 #include "acl/Gadgets.h"
-#include "auth/SchemeConfig.h"
 #include "auth/CredentialsCache.h"
 #include "auth/Gadgets.h"
+#include "auth/SchemeConfig.h"
 #include "auth/User.h"
 #include "auth/UserRequest.h"
 #include "event.h"
diff --git a/src/auth/basic/Config.h b/src/auth/basic/Config.h
index fa71ce572d..f9f38cf9be 100644
--- a/src/auth/basic/Config.h
+++ b/src/auth/basic/Config.h
@@ -11,8 +11,8 @@
 
 #if HAVE_AUTH_MODULE_BASIC
 
-#include "auth/SchemeConfig.h"
 #include "auth/Gadgets.h"
+#include "auth/SchemeConfig.h"
 #include "auth/UserRequest.h"
 #include "helper/forward.h"
 
diff --git a/src/auth/digest/Config.h b/src/auth/digest/Config.h
index e7cee4d75a..860a420e75 100644
--- a/src/auth/digest/Config.h
+++ b/src/auth/digest/Config.h
@@ -11,8 +11,8 @@
 
 #if HAVE_AUTH_MODULE_DIGEST
 
-#include "auth/SchemeConfig.h"
 #include "auth/Gadgets.h"
+#include "auth/SchemeConfig.h"
 #include "auth/UserRequest.h"
 #include "helper/forward.h"
 #include "rfc2617.h"
diff --git a/src/auth/negotiate/Config.h b/src/auth/negotiate/Config.h
index 24b370b094..bdeeee67ef 100644
--- a/src/auth/negotiate/Config.h
+++ b/src/auth/negotiate/Config.h
@@ -11,8 +11,8 @@
 
 #if HAVE_AUTH_MODULE_NEGOTIATE
 
-#include "auth/SchemeConfig.h"
 #include "auth/Gadgets.h"
+#include "auth/SchemeConfig.h"
 #include "auth/UserRequest.h"
 #include "helper/forward.h"
 
diff --git a/src/auth/negotiate/User.cc b/src/auth/negotiate/User.cc
index 1c9f7e5d48..0f5aff38bd 100644
--- a/src/auth/negotiate/User.cc
+++ b/src/auth/negotiate/User.cc
@@ -7,9 +7,9 @@
  */
 
 #include "squid.h"
-#include "auth/SchemeConfig.h"
 #include "auth/CredentialsCache.h"
 #include "auth/negotiate/User.h"
+#include "auth/SchemeConfig.h"
 #include "Debug.h"
 
 Auth::Negotiate::User::User(Auth::SchemeConfig *aConfig, const char *aRequestRealm) :
diff --git a/src/auth/ntlm/Config.h b/src/auth/ntlm/Config.h
index 22282896c3..02b6ed0dea 100644
--- a/src/auth/ntlm/Config.h
+++ b/src/auth/ntlm/Config.h
@@ -11,8 +11,8 @@
 
 #if HAVE_AUTH_MODULE_NTLM
 
-#include "auth/SchemeConfig.h"
 #include "auth/Gadgets.h"
+#include "auth/SchemeConfig.h"
 #include "auth/UserRequest.h"
 #include "helper/forward.h"
 
diff --git a/src/auth/ntlm/User.cc b/src/auth/ntlm/User.cc
index f0e3045dd6..d6e5c7bdc3 100644
--- a/src/auth/ntlm/User.cc
+++ b/src/auth/ntlm/User.cc
@@ -7,9 +7,9 @@
  */
 
 #include "squid.h"
-#include "auth/SchemeConfig.h"
 #include "auth/CredentialsCache.h"
 #include "auth/ntlm/User.h"
+#include "auth/SchemeConfig.h"
 #include "Debug.h"
 
 Auth::Ntlm::User::User(Auth::SchemeConfig *aConfig, const char *aRequestRealm) :
diff --git a/src/main.cc b/src/main.cc
index f78cb2e2a8..cb3cf4905e 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -12,9 +12,9 @@
 #include "AccessLogEntry.h"
 #include "acl/Acl.h"
 #include "acl/Asn.h"
-#include "AuthReg.h"
 #include "auth/Config.h"
 #include "auth/Gadgets.h"
+#include "AuthReg.h"
 #include "base/RunnersRegistry.h"
 #include "base/Subscription.h"
 #include "base/TextException.h"