From: Eric Covener <covener@apache.org>
Date: Fri, 3 Jan 2014 01:59:12 +0000 (+0000)
Subject: Providers defined in <AuthnProviderAlias have not been usable under
X-Git-Tag: 2.5.0-alpha~4684
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb7516d35a3d53a6a198b2e7f0f1c44c0d723928;p=apache

Providers defined in <AuthnProviderAlias have not been usable under
in virtual hosts since migrating from mod_authn_alias to mod_authn_core.
PR 55622.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554995 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/aaa/mod_authn_core.c b/modules/aaa/mod_authn_core.c
index 29d1988fb6..1f1163ec08 100644
--- a/modules/aaa/mod_authn_core.c
+++ b/modules/aaa/mod_authn_core.c
@@ -179,6 +179,12 @@ static void *create_authn_alias_svr_config(apr_pool_t *p, server_rec *s)
     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 */
 };