Further clarify the naming of the entity that originates the request by

[apache] / modules / aaa / mod_access_compat.c

diff --git a/modules/aaa/mod_access_compat.c b/modules/aaa/mod_access_compat.c
index df21fefb8081ddb2af73404e9c8572f814ee1d56..8d7afca19f088878df1efb41eab4f85cdcf189c7 100644 (file)
--- a/modules/aaa/mod_access_compat.c
+++ b/modules/aaa/mod_access_compat.c
@@ -271,7 +271,7 @@ static int find_allowdeny(request_rec *r, apr_array_header_t *a, int method)
             return 1;
 
         case T_IP:
-            if (apr_ipsubnet_test(ap[i].x.ip, r->connection->remote_addr)) {
+            if (apr_ipsubnet_test(ap[i].x.ip, r->useragent_addr)) {
                 return 1;
             }
             break;
@@ -349,20 +349,8 @@ static int check_dir_access(request_rec *r)
         }
     }
 
-    if (ret == OK) {
-        apr_table_setn(r->notes, AUTHZ_ACCESS_PASSED_NOTE, "Y");
-    }
-    else {
-        apr_table_setn(r->notes, AUTHZ_ACCESS_PASSED_NOTE, "N");
-        /* If Satisfy is not Any and authorization is required, then 
-           defer to the authorization stage */
-        if ((access_compat_ap_satisfies(r) != SATISFY_ANY) && ap_some_auth_required(r)) {
-            ret = OK;
-        }
-    }
-
     if (ret == HTTP_FORBIDDEN) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01797)
                       "client denied by server configuration: %s%s",
                       r->filename ? "" : "uri ",
                       r->filename ? r->filename : r->uri);
@@ -380,7 +368,7 @@ static void register_hooks(apr_pool_t *p)
                          AP_AUTH_INTERNAL_PER_CONF);
 }
 
-module AP_MODULE_DECLARE_DATA access_compat_module =
+AP_DECLARE_MODULE(access_compat) =
 {
     STANDARD20_MODULE_STUFF,
     create_access_compat_dir_config,   /* dir config creater */