You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2013/05/20 10:29:21 UTC
svn commit: r1484398 - in /httpd/httpd/trunk: CHANGES
modules/aaa/mod_authn_file.c modules/aaa/mod_authz_groupfile.c
Author: jailletc36
Date: Mon May 20 08:29:21 2013
New Revision: 1484398
URL: http://svn.apache.org/r1484398
Log:
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.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/aaa/mod_authn_file.c
httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1484398&r1=1484397&r2=1484398&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon May 20 08:29:21 2013
@@ -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 <tixu cs.ucsd.edu> and Christophe Jaillet]
+
*) mod_proxy_http: Make the proxy-interim-response environment variable
effective by formally overriding origin server behaviour. [Graham
Leggett, Co-Advisor <coad measurement-factory.com>]
Modified: httpd/httpd/trunk/modules/aaa/mod_authn_file.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_file.c?rev=1484398&r1=1484397&r2=1484398&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_file.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_file.c Mon May 20 08:29:21 2013
@@ -44,21 +44,11 @@ static void *create_authn_file_dir_confi
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}
};
Modified: httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c?rev=1484398&r1=1484397&r2=1484398&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c Mon May 20 08:29:21 2013
@@ -69,22 +69,12 @@ static void *create_authz_groupfile_dir_
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}
};