changed module name to more consistent naming scheme, as used by configure: mod_auth_...

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

diff --git a/modules/aaa/mod_auth_anon.c b/modules/aaa/mod_auth_anon.c
index 2ee33ecbc372936f3112b8b7e7796ecdddf322e6..b02dd791027acd200e0ba75aae22849624f432fd 100644 (file)
--- a/modules/aaa/mod_auth_anon.c
+++ b/modules/aaa/mod_auth_anon.c
@@ -209,13 +209,13 @@ static const command_rec anon_auth_cmds[] =
     {NULL}
 };
 
-module MODULE_VAR_EXPORT anon_auth_module;
+module MODULE_VAR_EXPORT auth_anon_module;
 
 static int anon_authenticate_basic_user(request_rec *r)
 {
     anon_auth_config_rec *sec =
     (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config,
-                                              &anon_auth_module);
+                                              &auth_anon_module);
     const char *sent_pw;
     int res = DECLINED;
 
@@ -276,7 +276,7 @@ static int check_anon_access(request_rec *r)
     conn_rec *c = r->connection;
     anon_auth_config_rec *sec =
     (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config,
-                                              &anon_auth_module);
+                                              &auth_anon_module);
 
     if (!sec->auth_anon)
        return DECLINED;
@@ -294,7 +294,7 @@ static void register_hooks(void)
     ap_hook_auth_checker(check_anon_access,NULL,NULL,HOOK_MIDDLE);
 }
 
-module MODULE_VAR_EXPORT anon_auth_module =
+module MODULE_VAR_EXPORT auth_anon_module =
 {
     STANDARD20_MODULE_STUFF,
     create_anon_auth_dir_config,/* dir config creater */

diff --git a/modules/aaa/mod_auth_anon.exp b/modules/aaa/mod_auth_anon.exp
index 4139896061ecbea338d3615c6b2b226a1ee0d1d0..63282532a9aa667311bc1435de6fbd72d084d96f 100644 (file)
--- a/modules/aaa/mod_auth_anon.exp
+++ b/modules/aaa/mod_auth_anon.exp
@@ -1 +1 @@
-anon_auth_module
+auth_anon_module

diff --git a/modules/aaa/mod_auth_db.c b/modules/aaa/mod_auth_db.c
index 579818e692570886bed2a9d1a81ad0c5174ee3fe..2233f6e92af6cd5d33e67333c34c2d7c66760409 100644 (file)
--- a/modules/aaa/mod_auth_db.c
+++ b/modules/aaa/mod_auth_db.c
@@ -72,7 +72,7 @@
  *           instead of   AuthDBMUserFile    AuthDBMGroupFile
  *
  * Also, in the configuration file you need to specify
- *  db_auth_module rather than dbm_auth_module
+ *  auth_db_module rather than auth_dbm_module
  *
  * On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically
  * mapped to Berkeley DB. You can use either mod_auth_dbm or
@@ -150,7 +150,7 @@ static const command_rec db_auth_cmds[] =
     {NULL}
 };
 
-module db_auth_module;
+module auth_db_module;
 
 static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile)
 {
@@ -225,7 +225,7 @@ static int db_authenticate_basic_user(request_rec *r)
 {
     db_auth_config_rec *sec =
     (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
-                                            &db_auth_module);
+                                            &auth_db_module);
     const char *sent_pw;
     char *real_pw, *colon_pw;
     char *invalid_pw;
@@ -267,7 +267,7 @@ static int db_check_auth(request_rec *r)
 {
     db_auth_config_rec *sec =
     (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
-                                            &db_auth_module);
+                                            &auth_db_module);
     char *user = r->user;
     int m = r->method_number;
 
@@ -325,7 +325,7 @@ static int db_check_auth(request_rec *r)
 }
 
 
-module db_auth_module =
+module auth_db_module =
 {
     STANDARD_MODULE_STUFF,
     NULL,                      /* initializer */

diff --git a/modules/aaa/mod_auth_dbm.c b/modules/aaa/mod_auth_dbm.c
index da660cbe1e7d0460a141c1c72348ea0464482972..5cc6094fffd4a26973d6d50e2534268a4ddfbcb1 100644 (file)
--- a/modules/aaa/mod_auth_dbm.c
+++ b/modules/aaa/mod_auth_dbm.c
@@ -87,7 +87,7 @@
  * instead.
  *
  * MODULE-DEFINITION-START
- * Name: dbm_auth_module
+ * Name: auth_dbm_module
  * ConfigStart
     . ./helpers/find-dbm-lib
  * ConfigEnd
@@ -142,7 +142,7 @@ static const command_rec dbm_auth_cmds[] =
     {NULL}
 };
 
-module dbm_auth_module;
+module auth_dbm_module;
 
 static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile)
 {
@@ -209,7 +209,7 @@ static int dbm_authenticate_basic_user(request_rec *r)
 {
     dbm_auth_config_rec *sec =
     (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
-                                             &dbm_auth_module);
+                                             &auth_dbm_module);
     const char *sent_pw;
     char *real_pw, *colon_pw;
     ap_status_t invalid_pw;
@@ -251,7 +251,7 @@ static int dbm_check_auth(request_rec *r)
 {
     dbm_auth_config_rec *sec =
     (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
-                                             &dbm_auth_module);
+                                             &auth_dbm_module);
     char *user = r->user;
     int m = r->method_number;
 
@@ -315,7 +315,7 @@ static void register_hooks(void)
     ap_hook_auth_checker(dbm_check_auth, NULL, NULL, HOOK_MIDDLE);
 }
 
-module dbm_auth_module =
+module auth_dbm_module =
 {
     STANDARD20_MODULE_STUFF,
     create_dbm_auth_dir_config,        /* dir config creater */

diff --git a/modules/aaa/mod_auth_dbm.exp b/modules/aaa/mod_auth_dbm.exp
index dc8a438deb1a416b3ad35be28052e9be4c00447b..7038e8047d7114def4c325f3cb03596c47de22ae 100644 (file)
--- a/modules/aaa/mod_auth_dbm.exp
+++ b/modules/aaa/mod_auth_dbm.exp
@@ -1 +1 @@
-dbm_auth_module
+auth_dbm_module