You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2005/07/20 18:23:38 UTC

svn commit: r219936 - in /httpd/httpd/trunk/modules/aaa: mod_authz_dbm.c mod_authz_groupfile.c mod_authz_user.c

Author: rbowen
Date: Wed Jul 20 09:23:35 2005
New Revision: 219936

URL: http://svn.apache.org/viewcvs?rev=219936&view=rev
Log:
The arguments to require are case-sensitive, so that "Require User" and
"Require Valid-User" don't work. This makes those comparisons
case-insensitive.

Modified:
    httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
    httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c
    httpd/httpd/trunk/modules/aaa/mod_authz_user.c

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c?rev=219936&r1=219935&r2=219936&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c Wed Jul 20 09:23:35 2005
@@ -167,7 +167,7 @@
         t = reqs[x].requirement;
         w = ap_getword_white(r->pool, &t);
  
-        if (!strcmp(w, "file-group")) {
+        if (!cmpstri(w, "file-group")) {
             filegroup = apr_table_get(r->notes, AUTHZ_GROUP_NOTE);
             
             if (!filegroup) {
@@ -179,7 +179,7 @@
             }
         }
 
-        if (!strcmp(w, "group") || filegroup) {
+        if (!cmpstri(w, "group") || filegroup) {
             const char *realm = ap_auth_name(r);
             const char *groups;
             char *v;

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c?rev=219936&r1=219935&r2=219936&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c Wed Jul 20 09:23:35 2005
@@ -185,7 +185,7 @@
         w = ap_getword_white(r->pool, &t);
 
         /* needs mod_authz_owner to be present */
-        if (!strcmp(w, "file-group")) {
+        if (!cmpstri(w, "file-group")) {
             filegroup = apr_table_get(r->notes, AUTHZ_GROUP_NOTE);
             
             if (!filegroup) {
@@ -197,7 +197,7 @@
             }
         }
 
-        if (!strcmp(w, "group") || filegroup) {
+        if (!cmpstri(w, "group") || filegroup) {
             required_group = 1; /* remember the requirement */
 
             /* create group table only if actually needed. */

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_user.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authz_user.c?rev=219936&r1=219935&r2=219936&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_user.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_user.c Wed Jul 20 09:23:35 2005
@@ -77,10 +77,10 @@
 
         t = reqs[x].requirement;
         w = ap_getword_white(r->pool, &t);
-        if (!strcmp(w, "valid-user")) {
+        if (!cmpstri(w, "valid-user")) {
             return OK;
         }
-        if (!strcmp(w, "user")) {
+        if (!cmpstri(w, "user")) {
             /* And note that there are applicable requirements 
              * which we consider ourselves the owner of.
              */



Re: svn commit: r219936 - in /httpd/httpd/trunk/modules/aaa: mod_authz_dbm.c mod_authz_groupfile.c mod_authz_user.c

Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On July 21, 2005 6:30:36 PM +0200 Rich Bowen <rb...@rcbowen.com> wrote:

> Sorry. This is actually my very first code patch in all the years I've
> been working with Apache. Picking a nit. Will fix.

No worries - by all means, feel free to commit!  Just expect that we'll treat 
your commits with the same scrutiny as everyone else.  ;-)  -- justin

Re: svn commit: r219936 - in /httpd/httpd/trunk/modules/aaa: mod_authz_dbm.c mod_authz_groupfile.c mod_authz_user.c

Posted by Rich Bowen <rb...@rcbowen.com>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Justin Erenkrantz wrote:
> On Wed, Jul 20, 2005 at 04:23:38PM -0000, rbowen@apache.org wrote:
> 
>>-        if (!strcmp(w, "file-group")) {
>>+        if (!cmpstri(w, "file-group")) {
> 
> 
> Um, what's this?  Shouldn't that be strcasecmp?  -- justin

Sorry. This is actually my very first code patch in all the years I've
been working with Apache. Picking a nit. Will fix.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFC382sXP03+sx4yJMRApIBAJ9eBq94XXJ8x1Nw0HC11ZsTYaoRoQCfR+kg
K6HVHeomYwlJOjBkxSnIBq0=
=IHdT
-----END PGP SIGNATURE-----

Re: svn commit: r219936 - in /httpd/httpd/trunk/modules/aaa: mod_authz_dbm.c mod_authz_groupfile.c mod_authz_user.c

Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On Wed, Jul 20, 2005 at 04:23:38PM -0000, rbowen@apache.org wrote:
> -        if (!strcmp(w, "file-group")) {
> +        if (!cmpstri(w, "file-group")) {

Um, what's this?  Shouldn't that be strcasecmp?  -- justin