cvs commit: httpd-2.0/modules/aaa mod_authn_dbm.c mod_authn_file.c

[je...@apache.org]

jerenkrantz    2002/09/17 17:33:13

  Modified:    modules/aaa mod_authn_dbm.c mod_authn_file.c
  Log:
  Remove Authoritative functionality from the authn providers.
  
  All ordering semantics should be resolved by the modules which use these
  providers, not the providers themselves.
  
  Revision  Changes    Path
  1.4       +0 -10     httpd-2.0/modules/aaa/mod_authn_dbm.c
  
  Index: mod_authn_dbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_authn_dbm.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- mod_authn_dbm.c	13 Sep 2002 17:33:27 -0000	1.3
  +++ mod_authn_dbm.c	18 Sep 2002 00:33:13 -0000	1.4
  @@ -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 @@
   
       conf->pwfile = NULL;
       conf->dbmtype = "default";
  -    conf->authoritative = 1;  /* fortress is secure by default */
   
       return conf;
   }
  @@ -120,9 +113,6 @@
       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}
   };
   
  
  
  
  1.3       +0 -8      httpd-2.0/modules/aaa/mod_authn_file.c
  
  Index: mod_authn_file.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_authn_file.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- mod_authn_file.c	10 Sep 2002 06:57:03 -0000	1.2
  +++ mod_authn_file.c	18 Sep 2002 00:33:13 -0000	1.3
  @@ -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 @@
       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 @@
       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}
   };