svn commit: r1554995 - /httpd/httpd/trunk/modules/aaa/mod_authn_core.c

[co...@apache.org]

Author: covener
Date: Fri Jan  3 01:59:12 2014
New Revision: 1554995

URL: http://svn.apache.org/r1554995
Log:
Providers defined in <AuthnProviderAlias have not been usable under
in virtual hosts since migrating from mod_authn_alias to mod_authn_core.
PR 55622.


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

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_core.c?rev=1554995&r1=1554994&r2=1554995&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_core.c Fri Jan  3 01:59:12 2014
@@ -179,6 +179,12 @@ static void *create_authn_alias_svr_conf
     return (void *) authcfg;
 }
 
+/* Only per-server directive we have is GLOBAL_ONLY */
+static void *merge_authn_alias_svr_config(apr_pool_t *p, void *basev, void *overridesv)
+{
+    return basev;
+}
+
 static const authn_provider authn_alias_provider =
 {
     &authn_alias_check_password,
@@ -373,7 +379,7 @@ AP_DECLARE_MODULE(authn_core) =
     create_authn_core_dir_config,   /* dir config creater */
     merge_authn_core_dir_config,    /* dir merger --- default is to override */
     create_authn_alias_svr_config,  /* server config */
-    NULL,                           /* merge server config */
+    merge_authn_alias_svr_config,   /* merge server config */
     authn_cmds,
     register_hooks                  /* register hooks */
 };