Fix handling of authz configurations, make default authz logic replicate

[apache] / include / mod_auth.h

diff --git a/include/mod_auth.h b/include/mod_auth.h
index 7852e9e55452df2ff28d2860ad09a48c5d8eb804..8097d682c17be3f5828793f773330ff6e7bc2788 100644 (file)
--- a/include/mod_auth.h
+++ b/include/mod_auth.h
@@ -42,10 +42,8 @@ extern "C" {
 #define AUTHZ_PROVIDER_VERSION "0"
 #define AUTHN_DEFAULT_PROVIDER "file"
 
-#define AUTHZ_GROUP_NOTE "authz_group_note"
 #define AUTHN_PROVIDER_NAME_NOTE "authn_provider_name"
 #define AUTHZ_PROVIDER_NAME_NOTE "authz_provider_name"
-#define AUTHZ_ACCESS_PASSED_NOTE "authz_access_passed"
 
 #define AUTHN_PREFIX "AUTHENTICATE_"
 
@@ -73,15 +71,10 @@ typedef enum {
 typedef enum {
     AUTHZ_DENIED,
     AUTHZ_GRANTED,
-    AUTHZ_GENERAL_ERROR,
     AUTHZ_NEUTRAL,
+    AUTHZ_GENERAL_ERROR
 } authz_status;
 
-typedef enum {
-       AUTHZ_REQSTATE_ONE,
-       AUTHZ_REQSTATE_ALL
-} authz_request_state;
-
 typedef struct {
     /* Given a username and password, expected to return AUTH_GRANTED
      * if we can validate this user/password combination.
@@ -106,30 +99,13 @@ struct authn_provider_list {
 };
 
 typedef struct {
-    /* Given a request_rec, expected to return AUTH_GRANTED
+    /* Given a request_rec, expected to return AUTHZ_GRANTED
      * if we can authorize user access.
      */
     authz_status (*check_authorization)(request_rec *r,
                                         const char *require_line);
 } authz_provider;
 
-/* A linked-list of authn providers. */
-typedef struct authz_provider_list authz_provider_list;
-
-struct authz_provider_list {
-    const char *provider_name;
-    const authz_provider *provider;
-       authz_provider_list *one_next;
-       authz_provider_list *all_next;
-    /** If a Limit method is in effect, this field will be set */
-    apr_int64_t method_mask;
-       authz_request_state req_state;
-    int req_state_level;
-    /** String following 'require <provider>' from config file */
-    char *requirement;
-    int is_reject;
-};
-
 #ifdef __cplusplus
 }
 #endif