From: Nick Kew Date: Fri, 20 Jul 2007 11:56:36 +0000 (+0000) Subject: Fix clash between r557837 and r427780 X-Git-Tag: 2.3.0~1709 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=286110c4934174252ce293d56d4ff697091a6383;p=apache 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 87a1c8d572..15557f4e4b 100644 --- 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. */