From e19ada40dd72f48ecfdb5e2f46e5e44df55427d6 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Mon, 20 May 2013 08:29:21 +0000 Subject: [PATCH] Fix PR 54463 by removing an optional 'standard' parameter. It has been no-une for more than 10 years and is not documented. This also makes the code more consistent with other mod_auth modules. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484398 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ modules/aaa/mod_authn_file.c | 16 +++------------- modules/aaa/mod_authz_groupfile.c | 18 ++++-------------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/CHANGES b/CHANGES index a247db179c..c4709deb5e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) 'AuthGroupFile' and 'AuthUserFile' do not accept anymore the optional + 'standard' keyword . It was unused and not documented. + PR54463 [Tianyin Xu and Christophe Jaillet] + *) mod_proxy_http: Make the proxy-interim-response environment variable effective by formally overriding origin server behaviour. [Graham Leggett, Co-Advisor ] diff --git a/modules/aaa/mod_authn_file.c b/modules/aaa/mod_authn_file.c index 9de7a4cc88..4d774f403e 100644 --- a/modules/aaa/mod_authn_file.c +++ b/modules/aaa/mod_authn_file.c @@ -44,21 +44,11 @@ static void *create_authn_file_dir_config(apr_pool_t *p, char *d) return conf; } -static const char *set_authn_file_slot(cmd_parms *cmd, void *offset, - const char *f, const char *t) -{ - if (t && strcmp(t, "standard")) { - return apr_pstrcat(cmd->pool, "Invalid auth file type: ", t, NULL); - } - - return ap_set_file_slot(cmd, offset, f); -} - static const command_rec authn_file_cmds[] = { - AP_INIT_TAKE12("AuthUserFile", set_authn_file_slot, - (void *)APR_OFFSETOF(authn_file_config_rec, pwfile), - OR_AUTHCFG, "text file containing user IDs and passwords"), + AP_INIT_TAKE1("AuthUserFile", ap_set_file_slot, + (void *)APR_OFFSETOF(authn_file_config_rec, pwfile), + OR_AUTHCFG, "text file containing user IDs and passwords"), {NULL} }; diff --git a/modules/aaa/mod_authz_groupfile.c b/modules/aaa/mod_authz_groupfile.c index ee0616d3d2..dab651cbee 100644 --- a/modules/aaa/mod_authz_groupfile.c +++ b/modules/aaa/mod_authz_groupfile.c @@ -69,22 +69,12 @@ static void *create_authz_groupfile_dir_config(apr_pool_t *p, char *d) return conf; } -static const char *set_authz_groupfile_slot(cmd_parms *cmd, void *offset, const char *f, - const char *t) -{ - if (t && strcmp(t, "standard")) { - return apr_pstrcat(cmd->pool, "Invalid auth file type: ", t, NULL); - } - - return ap_set_file_slot(cmd, offset, f); -} - static const command_rec authz_groupfile_cmds[] = { - AP_INIT_TAKE12("AuthGroupFile", set_authz_groupfile_slot, - (void *)APR_OFFSETOF(authz_groupfile_config_rec, groupfile), - OR_AUTHCFG, - "text file containing group names and member user IDs"), + AP_INIT_TAKE1("AuthGroupFile", ap_set_file_slot, + (void *)APR_OFFSETOF(authz_groupfile_config_rec, groupfile), + OR_AUTHCFG, + "text file containing group names and member user IDs"), {NULL} }; -- 2.40.0