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
This commit is contained in:
Christophe Jaillet
2013-05-20 08:29:21 +00:00
parent 62ff5813e5
commit e19ada40dd
3 changed files with 11 additions and 27 deletions

View File

@ -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}
};