From da6752995e59be259400b9919d381f543db9f8f0 Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Fri, 3 Jan 2014 01:59:12 +0000
Subject: [PATCH] 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
---
 modules/aaa/mod_authn_core.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/aaa/mod_authn_core.c b/modules/aaa/mod_authn_core.c
index 29d1988fb6d..1f1163ec086 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 */
 };
-- 
2.47.3