Commit f4109399 authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files

Fix PR37566: write to the log if the authgroupfile cannot be opened. 

Submitted by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@371644 13f79535-47bb-0310-9956-ffa450edef68
parent 2d086ce6

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- 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


































modules/aaa/mod_auth.c



+5
−4



























Changes for modules/aaa/mod_auth.c: 5 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -113,8 +113,9 @@ static char *get_pw(request_rec *r, char *user, char *auth_pwfile)







    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 @@ static apr_table_t *groups_for_user(apr_pool_t *p, char *user, char *grpfile)







    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 @@ static int check_user_access(request_rec *r)







    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;