From: Graham Leggett <minfrin@apache.org>
Date: Thu, 23 May 2013 14:35:33 +0000 (+0000)
Subject: mod_authn_file, mod_authz_groupfile: remove an unused and undocumented
X-Git-Tag: 2.4.5~239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25f30a0878a3c81c56eab72b1fed1965d4fe7abc;p=apache

mod_authn_file, mod_authz_groupfile: remove an unused and undocumented
"standard" optional parameter for 'AuthGroupFile' and 'AuthUserFile'

trunk patch: http://svn.apache.org/r1484398
Submitted by: jailletc36
Reviewed by: covener, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1485737 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index e641bad1e3..9ad48154b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.5
 
+  *) '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]
+
   *) core: Do not over allocate memory within 'ap_rgetline_core' for
      the common case. [Christophe Jaillet]
 
diff --git a/STATUS b/STATUS
index 861ea821a3..ba47271628 100644
--- a/STATUS
+++ b/STATUS
@@ -90,12 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_authn_file, mod_authz_groupfile: remove an unused and undocumented
-      "standard" optional parameter for 'AuthGroupFile' and 'AuthUserFile'
-      trunk patch: http://svn.apache.org/r1484398
-      2.4.x patch: trunk works, modulo CHANGES
-      +1: jailletc36, covener, minfrin
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/aaa/mod_authn_file.c b/modules/aaa/mod_authn_file.c
index a54a423b24..9909e44391 100644
--- a/modules/aaa/mod_authn_file.c
+++ b/modules/aaa/mod_authn_file.c
@@ -45,21 +45,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 15bb60ffe1..934a7d2f14 100644
--- a/modules/aaa/mod_authz_groupfile.c
+++ b/modules/aaa/mod_authz_groupfile.c
@@ -70,22 +70,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}
 };