Source Format Enforcement (#763)

[thirdparty/squid.git] / src / auth / basic / Config.h

diff --git a/src/auth/basic/Config.h b/src/auth/basic/Config.h
index 2a7589ea33dd8d30bf89d22fd72b2613fedacbec..e126faec6db0a55e2933b48843a83c0d21597115 100644 (file)
--- a/src/auth/basic/Config.h
+++ b/src/auth/basic/Config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -9,8 +9,10 @@
 #ifndef __AUTH_BASIC_H__
 #define __AUTH_BASIC_H__
 
-#include "auth/Config.h"
+#if HAVE_AUTH_MODULE_BASIC
+
 #include "auth/Gadgets.h"
+#include "auth/SchemeConfig.h"
 #include "auth/UserRequest.h"
 #include "helper/forward.h"
 
@@ -20,19 +22,19 @@ namespace Basic
 {
 
 /** Basic authentication configuration data */
-class Config : public Auth::Config
+class Config : public Auth::SchemeConfig
 {
 public:
     Config();
     virtual bool active() const;
     virtual bool configured() const;
-    virtual Auth::UserRequest::Pointer decode(char const *proxy_auth, const char *requestRealm);
+    virtual Auth::UserRequest::Pointer decode(char const *proxy_auth, const HttpRequest *request, const char *requestRealm);
     virtual void done();
     virtual void rotateHelpers();
-    virtual bool dump(StoreEntry *, const char *, Auth::Config *) const;
-    virtual void fixHeader(Auth::UserRequest::Pointer, HttpReply *, http_hdr_type, HttpRequest *);
-    virtual void init(Auth::Config *);
-    virtual void parse(Auth::Config *, int, char *);
+    virtual bool dump(StoreEntry *, const char *, Auth::SchemeConfig *) const;
+    virtual void fixHeader(Auth::UserRequest::Pointer, HttpReply *, Http::HdrType, HttpRequest *);
+    virtual void init(Auth::SchemeConfig *);
+    virtual void parse(Auth::SchemeConfig *, int, char *);
     void decode(char const *httpAuthHeader, Auth::UserRequest::Pointer);
     virtual void registerWithCacheManager(void);
     virtual const char * type() const;
@@ -40,10 +42,9 @@ public:
 public:
     time_t credentialsTTL;
     int casesensitive;
-    int utf8;
 
 private:
-    char * decodeCleartext(const char *httpAuthHeader);
+    char * decodeCleartext(const char *httpAuthHeader, const HttpRequest *request);
 };
 
 } // namespace Basic
@@ -51,5 +52,6 @@ private:
 
 extern helper *basicauthenticators;
 
+#endif /* HAVE_AUTH_MODULE_BASIC */
 #endif /* __AUTH_BASIC_H__ */