1 files changed, 24 insertions, 32 deletions

diff --git a/mod_log_sql_ssl.c b/mod_log_sql_ssl.c
index 92e0684..c874a2b 100644
--- a/mod_log_sql_ssl.c
+++ b/mod_log_sql_ssl.c
@@ -1,4 +1,4 @@
-/* $Header: /home/cvs/mod_log_sql/mod_log_sql_ssl.c,v 1.3 2004/01/21 04:34:21 urkle Exp $ */
+/* $Header: /home/cvs/mod_log_sql/mod_log_sql_ssl.c,v 1.4 2004/01/22 05:26:56 urkle Exp $ */
 /* mod_log_sql_ssl */
 
 #if defined(WITH_APACHE20)
@@ -22,18 +22,19 @@
 #include "config.h"
 #endif
 
+#include "mod_log_sql.h"
 #include "mod_ssl.h"
 
+#if defined(WITH_APACHE20)
+#       define TEST_SSL(r) myConnConfig(r->connection)
+#elif defined(WITH_APACHE13)
+#       define TEST_SSL(r) ap_ctx_get(r->connection->client->ctx, "ssl")
+#endif
+
 static const char *extract_ssl_keysize(request_rec *r, char *a)
 {
         char *result = NULL;
-#if defined(APACHE20)
-        SSLConnRec *scc = myConnConfig(r->connection);
-        SSLSrvConfigRec *ssc = mySrvConfig(r->server);
-        if (myCtxConfig(scc,ssc) != NULL
-#elif defined(APACHE13)
-        if (ap_ctx_get(r->connection->client->ctx, "ssl") != NULL) 
-#endif
+        if (TEST_SSL(r) != NULL)
         {
             result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_USEKEYSIZE");
                 #ifdef DEBUG
@@ -50,13 +51,7 @@ static const char *extract_ssl_keysize(request_rec *r, char *a)
 static const char *extract_ssl_maxkeysize(request_rec *r, char *a)
 {
         char *result = NULL;
-#if defined(APACHE20)
-        SSLConnRec *scc = myConnConfig(r->connection);
-        SSLSrvConfigRec *ssc = mySrvConfig(r->server);
-        if (myCtxConfig(scc,ssc) != NULL
-#elif defined(APACHE13)
-        if (ap_ctx_get(r->connection->client->ctx, "ssl") != NULL) 
-#endif
+        if (TEST_SSL(r) != NULL) 
         {
                 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE");
                 #ifdef DEBUG
@@ -73,13 +68,7 @@ static const char *extract_ssl_maxkeysize(request_rec *r, char *a)
 static const char *extract_ssl_cipher(request_rec *r, char *a)
 {
         char *result = NULL;
-#if defined(APACHE20)
-        SSLConnRec *scc = myConnConfig(r->connection);
-        SSLSrvConfigRec *ssc = mySrvConfig(r->server);
-        if (myCtxConfig(scc,ssc) != NULL
-#elif defined(APACHE13)
-        if (ap_ctx_get(r->connection->client->ctx, "ssl") != NULL) 
-#endif
+        if (TEST_SSL(r) != NULL)
         {
             result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER");
                 #ifdef DEBUG
@@ -94,23 +83,26 @@ static const char *extract_ssl_cipher(request_rec *r, char *a)
 }
 
 #if defined(WITH_APACHE20)
-static int pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp)
+static int post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
 #elif defined(WITH_APACHE13)
 static void module_init(server_rec *s, apr_pool_t *p)
 #endif
 {
-        log_sql_register_item(p,'q', extract_ssl_keysize,       "ssl_keysize",      0, 1);
-        log_sql_register_item(p,'Q', extract_ssl_maxkeysize,    "ssl_maxkeysize",   0, 1);
-        log_sql_register_item(p,'z', extract_ssl_cipher,        "ssl_cipher",       0, 1);
+        log_sql_register_item(s,p,'q', extract_ssl_keysize,       "ssl_keysize",      0, 1);
+        log_sql_register_item(s,p,'Q', extract_ssl_maxkeysize,    "ssl_maxkeysize",   0, 1);
+        log_sql_register_item(s,p,'z', extract_ssl_cipher,        "ssl_cipher",       0, 1);
+#if defined(WITH_APACHE20)
+        return OK;
+#endif
 }
 
 /* The configuration array that sets up the hooks into the module. */
 #if defined(WITH_APACHE20)
 static void register_hooks(apr_pool_t *p) {
-        ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
+        ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
 }
 
-module AP_MODULE_DECLARE_DATA log_sql_module = {
+module AP_MODULE_DECLARE_DATA log_sql_ssl_module = {
         STANDARD20_MODULE_STUFF,
         NULL,           /* create per-directory config structures */
     NULL,               /* merge per-directory config structures */
@@ -127,7 +119,7 @@ module log_sql_ssl_module = {
         NULL,                                   /* merge per-dir config                         */
         NULL,                                   /* create server config                         */
         NULL,                                   /* merge server config                  */
-        log_sql_cmds,                   /* config directive table                       */
+        NULL,                   /* config directive table                       */
         NULL,                                   /* [9] content handlers                         */
         NULL,                                   /* [2] URI-to-filename translation */
         NULL,                                   /* [5] check/validate user_id           */
@@ -135,11 +127,11 @@ module log_sql_ssl_module = {
         NULL,                                   /* [4] check access by host             */
         NULL,                                   /* [7] MIME type checker/setter         */
         NULL,                                   /* [8] fixups                                           */
-        log_sql_transaction,    /* [10] logger                                  */
+        NULL,   /* [10] logger                                  */
         NULL                                    /* [3] header parser                            */
 #if MODULE_MAGIC_NUMBER >= 19970728 /* 1.3-dev or later support these additionals... */
-        ,log_sql_child_init,   /* child process initializer             */
-        log_sql_child_exit,    /* process exit/cleanup                  */
+        ,NULL,   /* child process initializer           */
+        NULL,    /* process exit/cleanup                        */
         NULL                                     /* [1] post read-request                       */
 #endif