svn commit: r1056717 - /httpd/httpd/trunk/modules/aaa/mod_authz_core.c

[sf...@apache.org]

Author: sf
Date: Sat Jan  8 14:37:09 2011
New Revision: 1056717

URL: http://svn.apache.org/viewvc?rev=1056717&view=rev
Log:
Don't log AuthMerging XXX as <RequireXXX>

Modified:
    httpd/httpd/trunk/modules/aaa/mod_authz_core.c

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_core.c?rev=1056717&r1=1056716&r2=1056717&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_core.c Sat Jan  8 14:37:09 2011
@@ -73,6 +73,9 @@ struct authz_section_conf {
     apr_int64_t limited;
     authz_logic_op op;
     int negate;
+    /** true if this is not a real container but produced by AuthMerging;
+     *  only used for logging */
+    int is_merged;
     authz_section_conf *first;
     authz_section_conf *next;
 };
@@ -136,6 +139,7 @@ static void *merge_authz_core_dir_config
                     base->section->limited | new->section->limited;
 
                 section->op = new->op;
+                section->is_merged = 1;
 
                 section->first = apr_pmemdup(p, base->section,
                                              sizeof(*base->section));
@@ -325,7 +329,7 @@ static const char* format_authz_result(a
             : ((result == AUTHZ_GRANTED)
                ? "granted"
                : ((result == AUTHZ_DENIED_NO_USER)
-                  ? "denied (no authenticated user)"
+                  ? "denied (no authenticated user yet)"
                   : "neutral")));
 }
 
@@ -336,11 +340,11 @@ static const char* format_authz_command(
             ? apr_pstrcat(p, "Require ", (section->negate ? "not " : ""),
                           section->provider_name, " ",
                           section->provider_args, NULL)
-            : apr_pstrcat(p, "<Require",
+            : apr_pstrcat(p, section->is_merged ? "AuthMerging " : "<Require",
                           ((section->op == AUTHZ_LOGIC_AND)
                            ? (section->negate ? "NotAll" : "All")
                            : (section->negate ? "None" : "Any")),
-                          ">", NULL));
+                          section->is_merged ? "" : ">", NULL));
 }
 
 static authz_section_conf* create_default_section(apr_pool_t *p)