You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
973 B
27 lines
973 B
6 years ago
|
# ./pullrev.sh r1556818
|
||
|
|
http://svn.apache.org/viewvc?view=revision&revision=r1556818
|
||
|
|
--- httpd-2.4.6/modules/aaa/mod_authn_core.c 2014/01/09 14:30:23 1556817
|
||
|
|
+++ httpd-2.4.6/modules/aaa/mod_authn_core.c 2014/01/09 14:32:47 1556818
|
||
|
|
@@ -179,6 +179,12 @@
|
||
|
|
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 @@
|
||
|
|
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 */
|
||
|
|
};
|