Fix clash between r557837 and r427780

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

diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
index 87a1c8d5721991b2fe1cffbb8d8116243c14c184..15557f4e4b3395c41cb5c58d4d5761bc89cd08ac 100644 (file)
--- a/modules/aaa/mod_authz_core.c
+++ b/modules/aaa/mod_authz_core.c
@@ -132,7 +132,7 @@ static void *merge_authz_core_dir_config(apr_pool_t *a, void *basev, void *newv)
     /* Create this conf by duplicating the base, replacing elements
     * (or creating copies for merging) where new-> values exist.
     */
-    conf = (authz_core_dir_conf *)apr_pmemdup(a, new, sizeof(authz_core_dir_conf));
+    conf = (authz_core_dir_conf *)apr_pmemdup(a, base, sizeof(authz_core_dir_conf));
 
     /* Wipe out the providers and rejects lists so that 
         they can be recreated by the merge process. */