httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r371644 - in /httpd/httpd/branches/2.0.x: CHANGES modules/aaa/mod_auth.c
Date Mon, 23 Jan 2006 20:08:49 GMT
Author: colm
Date: Mon Jan 23 12:08:42 2006
New Revision: 371644

URL: http://svn.apache.org/viewcvs?rev=371644&view=rev
Log:
Fix PR37566: write to the log if the authgroupfile cannot be opened.

Submitted by: rpluem

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/modules/aaa/mod_auth.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=371644&r1=371643&r2=371644&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Mon Jan 23 12:08:42 2006
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.56
 
+  *) Write message to error log if AuthGroupFile cannot be opened.
+     PR 37566.  [Rüdiger Plüm]
+
   *) SECURITY: CVE-2005-3357 (cve.mitre.org)
      mod_ssl: Fix a possible crash during access control checks if a
      non-SSL request is processed for an SSL vhost (such as the

Modified: httpd/httpd/branches/2.0.x/modules/aaa/mod_auth.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/aaa/mod_auth.c?rev=371644&r1=371643&r2=371644&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/aaa/mod_auth.c (original)
+++ httpd/httpd/branches/2.0.x/modules/aaa/mod_auth.c Mon Jan 23 12:08:42 2006
@@ -113,8 +113,9 @@
     return NULL;
 }
 
-static apr_table_t *groups_for_user(apr_pool_t *p, char *user, char *grpfile)
+static apr_table_t *groups_for_user(request_rec *r, char *user, char *grpfile)
 {
+    apr_pool_t *p = r->pool;
     ap_configfile_t *f;
     apr_table_t *grps = apr_table_make(p, 15);
     apr_pool_t *sp;
@@ -123,8 +124,8 @@
     apr_status_t status;
 
     if ((status = ap_pcfg_openfile(&f, p, grpfile)) != APR_SUCCESS) {
-/*add?  aplog_error(APLOG_MARK, APLOG_ERR, NULL,
-                    "Could not open group file: %s", grpfile);*/
+         ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
+                       "Could not open group file: %s", grpfile);
         return NULL;
     }
 
@@ -228,7 +229,7 @@
     reqs = (require_line *)reqs_arr->elts;
 
     if (conf->auth_grpfile) {
-        grpstatus = groups_for_user(r->pool, user, conf->auth_grpfile);
+        grpstatus = groups_for_user(r, user, conf->auth_grpfile);
     }
     else {
         grpstatus = NULL;



Mime
View raw message