Remove Authoritative functionality from the authn providers.

All ordering semantics should be resolved by the modules which use these
providers, not the providers themselves.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96868 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/mod_authn_dbm.c b/modules/aaa/mod_authn_dbm.c
index a0b8e83a1a330cc492cdeff4205c1f11e2ec0b63..dcce4768ee240f7f842e5ec4084ce17be4d3a687 100644 (file)
--- a/modules/aaa/mod_authn_dbm.c
+++ b/modules/aaa/mod_authn_dbm.c
@@ -63,11 +63,6 @@
  * 
  * Adapted to Apache by rst.
  *
- * dirkx - Added Authoritative control to allow passing on to lower  
- *         modules if and only if the userid is not known to this
- *         module. A known user with a faulty or absent password still
- *         causes an AuthRequired. The default is 'Authoritative', i.e.
- *         no control is passed along.
  */
 
 #define APR_WANT_STRFUNC
@@ -88,7 +83,6 @@
 typedef struct {
     char *pwfile;
     char *dbmtype;
-    int authoritative;
 } authn_dbm_config_rec;
 
 static void *create_authn_dbm_dir_config(apr_pool_t *p, char *d)
@@ -97,7 +91,6 @@ static void *create_authn_dbm_dir_config(apr_pool_t *p, char *d)
 
     conf->pwfile = NULL;
     conf->dbmtype = "default";
-    conf->authoritative = 1;  /* fortress is secure by default */
 
     return conf;
 }
@@ -120,9 +113,6 @@ static const command_rec authn_dbm_cmds[] =
     AP_INIT_TAKE1("AuthDBMType", set_dbm_type,
      NULL,
      OR_AUTHCFG, "what type of DBM file the user file is"),
-    AP_INIT_FLAG("AuthDBMAuthoritative", ap_set_flag_slot,
-     (void *)APR_OFFSETOF(authn_dbm_config_rec, authoritative),
-     OR_AUTHCFG, "Set to 'no' to allow access control to be passed along to lower modules, if the UserID is not known in this module"),
     {NULL}
 };
 

diff --git a/modules/aaa/mod_authn_file.c b/modules/aaa/mod_authn_file.c
index fb7c1105c46a0504508f4febcf9f77465781698f..422a9ac2a97590acb0dea77799486dc6b545aa00 100644 (file)
--- a/modules/aaa/mod_authn_file.c
+++ b/modules/aaa/mod_authn_file.c
@@ -85,7 +85,6 @@
 
 typedef struct {
     char *pwfile;
-    int authoritative;
 } authn_file_config_rec;
 
 static void *create_authn_file_dir_config(apr_pool_t *p, char *d)
@@ -93,7 +92,6 @@ static void *create_authn_file_dir_config(apr_pool_t *p, char *d)
     authn_file_config_rec *conf = apr_palloc(p, sizeof(*conf));
 
     conf->pwfile = NULL;     /* just to illustrate the default really */
-    conf->authoritative = 1; /* keep the fortress secure by default */
     return conf;
 }
 
@@ -112,12 +110,6 @@ static const command_rec authn_file_cmds[] =
     AP_INIT_TAKE12("AuthUserFile", set_authn_file_slot,
                    (void *)APR_OFFSETOF(authn_file_config_rec, pwfile),
                    OR_AUTHCFG, "text file containing user IDs and passwords"),
-    AP_INIT_FLAG("AuthUserFileAuthoritative", ap_set_flag_slot,
-                 (void *)APR_OFFSETOF(authn_file_config_rec, authoritative),
-                 OR_AUTHCFG,
-                 "Set to 'no' to allow access control to be passed along to "
-                 "other modules if the BasicAuth username is not in "
-                 "AuthUserFile. (default is yes)." ),
     {NULL}
 };