httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r594559 - in /httpd/httpd/branches/2.2.x: STATUS modules/aaa/mod_authz_groupfile.c
Date Tue, 13 Nov 2007 15:06:33 GMT
Author: jim
Date: Tue Nov 13 07:06:33 2007
New Revision: 594559

URL: http://svn.apache.org/viewvc?rev=594559&view=rev
Log:
fruit... hanging low

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/aaa/mod_authz_groupfile.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=594559&r1=594558&r2=594559&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Nov 13 07:06:33 2007
@@ -79,12 +79,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_authz_groupfile: don't risk crash if r->user isn't set.
-     PR 42995
-     Trunk: n/a
-     2.2.x patch: http://people.apache.org/~niq/42995.patch
-     +1: niq, covener, trawick
-
    * mod_authn_dbd: Export any additional columns queried in the SQL select
      into the environment with the name AUTHENTICATE_<COLUMN>. This brings
      mod_authn_dbd behaviour in line with mod_authnz_ldap.

Modified: httpd/httpd/branches/2.2.x/modules/aaa/mod_authz_groupfile.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/mod_authz_groupfile.c?rev=594559&r1=594558&r2=594559&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/mod_authz_groupfile.c (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/mod_authz_groupfile.c Tue Nov 13 07:06:33 2007
@@ -173,6 +173,11 @@
         return DECLINED; /* XXX change from legacy */
     }
 
+    /* If there's no user, it's a misconfiguration */
+    if (!user) {
+        return HTTP_INTERNAL_SERVER_ERROR;
+    }
+
     reqs = (require_line *)reqs_arr->elts;
 
     for (x = 0; x < reqs_arr->nelts; x++) {



Mime
View raw message