[rs-commit] r365 - in /mod_ca/trunk: ChangeLog mod_ca_crl.c mod_ca_disk.c mod_ca_engine.c mod_ca_ldap.c mod_ca_simple.c

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Tue May  5 00:13:06 2020
New Revision: 365

Log:
Use the AP_DECLARE_MODULE() macro so that per-module
logging works properly.

Modified:
    mod_ca/trunk/ChangeLog
    mod_ca/trunk/mod_ca_crl.c
    mod_ca/trunk/mod_ca_disk.c
    mod_ca/trunk/mod_ca_engine.c
    mod_ca/trunk/mod_ca_ldap.c
    mod_ca/trunk/mod_ca_simple.c

Modified: mod_ca/trunk/ChangeLog
==============================================================================
--- mod_ca/trunk/ChangeLog	(original)
+++ mod_ca/trunk/ChangeLog	Tue May  5 00:13:06 2020
@@ -1,5 +1,8 @@
 
 Changes with v0.2.3
+
+ *) Use the AP_DECLARE_MODULE() macro so that per-module
+    logging works properly. [Graham Leggett]
 
  *) Make sure the signer certificate is included as the first
     intermediate certificate in the chain for mod_ca_simple and

Modified: mod_ca/trunk/mod_ca_crl.c
==============================================================================
--- mod_ca/trunk/mod_ca_crl.c	(original)
+++ mod_ca/trunk/mod_ca_crl.c	Tue May  5 00:13:06 2020
@@ -451,11 +451,13 @@
 
 }
 
-module AP_MODULE_DECLARE_DATA ca_crl_module =
-{ STANDARD20_MODULE_STUFF, create_ca_crl_dir_config, /* dir config creater */
-merge_ca_crl_dir_config, /* dir merger --- default is to override */
-NULL, /* server config */
-NULL, /* merge server config */
-ca_crl_cmds, /* command apr_table_t */
-register_hooks /* register hooks */
+AP_DECLARE_MODULE(ca_crl) =
+{
+    STANDARD20_MODULE_STUFF,
+    create_ca_crl_dir_config, /* dir config creater */
+    merge_ca_crl_dir_config,  /* dir merger --- default is to override */
+    NULL,                     /* server config */
+    NULL,                     /* merge server config */
+    ca_crl_cmds,              /* command apr_table_t */
+    register_hooks            /* register hooks */
 };

Modified: mod_ca/trunk/mod_ca_disk.c
==============================================================================
--- mod_ca/trunk/mod_ca_disk.c	(original)
+++ mod_ca/trunk/mod_ca_disk.c	Tue May  5 00:13:06 2020
@@ -1457,11 +1457,13 @@
 
 }
 
-module AP_MODULE_DECLARE_DATA ca_disk_module =
-{ STANDARD20_MODULE_STUFF, create_ca_dir_config, /* dir config creater */
-merge_ca_dir_config, /* dir merger --- default is to override */
-NULL, /* server config */
-NULL, /* merge server config */
-ca_cmds, /* command apr_table_t */
-register_hooks /* register hooks */
+AP_DECLARE_MODULE(ca_disk) =
+{
+    STANDARD20_MODULE_STUFF,
+    create_ca_dir_config, /* dir config creater */
+    merge_ca_dir_config,  /* dir merger --- default is to override */
+    NULL,                 /* server config */
+    NULL,                 /* merge server config */
+    ca_cmds,              /* command apr_table_t */
+    register_hooks        /* register hooks */
 };

Modified: mod_ca/trunk/mod_ca_engine.c
==============================================================================
--- mod_ca/trunk/mod_ca_engine.c	(original)
+++ mod_ca/trunk/mod_ca_engine.c	Tue May  5 00:13:06 2020
@@ -1111,11 +1111,13 @@
 
 }
 
-module AP_MODULE_DECLARE_DATA ca_engine_module =
-{ STANDARD20_MODULE_STUFF, create_ca_dir_config, /* dir config creater */
-merge_ca_dir_config, /* dir merger --- default is to override */
-create_ca_server_config, /* server config */
-merge_ca_server_config, /* merge server config */
-ca_cmds, /* command apr_table_t */
-register_hooks /* register hooks */
+AP_DECLARE_MODULE(ca_engine) =
+{
+    STANDARD20_MODULE_STUFF,
+    create_ca_dir_config,    /* dir config creater */
+    merge_ca_dir_config,     /* dir merger --- default is to override */
+    create_ca_server_config, /* server config */
+    merge_ca_server_config,  /* merge server config */
+    ca_cmds,                 /* command apr_table_t */
+    register_hooks           /* register hooks */
 };

Modified: mod_ca/trunk/mod_ca_ldap.c
==============================================================================
--- mod_ca/trunk/mod_ca_ldap.c	(original)
+++ mod_ca/trunk/mod_ca_ldap.c	Tue May  5 00:13:06 2020
@@ -1378,11 +1378,13 @@
             APR_HOOK_MIDDLE);
 }
 
-module AP_MODULE_DECLARE_DATA ca_ldap_module =
-{ STANDARD20_MODULE_STUFF, create_ca_dir_config, /* dir config creater */
-merge_ca_dir_config, /* dir merger --- default is to override */
-NULL, /* server config */
-NULL, /* merge server config */
-ca_cmds, /* command apr_table_t */
-register_hooks /* register hooks */
+AP_DECLARE_MODULE(ca_ldap) =
+{
+    STANDARD20_MODULE_STUFF,
+    create_ca_dir_config, /* dir config creater */
+    merge_ca_dir_config,  /* dir merger --- default is to override */
+    NULL,                 /* server config */
+    NULL,                 /* merge server config */
+    ca_cmds,              /* command apr_table_t */
+    register_hooks        /* register hooks */
 };

Modified: mod_ca/trunk/mod_ca_simple.c
==============================================================================
--- mod_ca/trunk/mod_ca_simple.c	(original)
+++ mod_ca/trunk/mod_ca_simple.c	Tue May  5 00:13:06 2020
@@ -1322,7 +1322,7 @@
 
 }
 
-module AP_MODULE_DECLARE_DATA ca_simple_module =
+AP_DECLARE_MODULE(ca_simple) =
 {
     STANDARD20_MODULE_STUFF,
     create_ca_dir_config, /* dir config creater */