mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 10:07:12 +00:00
Code Issues Releases Wiki Activity

mod_apparmor: for apache 2.4, use new access control hook

Browse Source 
Use ap_hook_check_access_ex() instead of
ap_hook_access_checker() for apache 2.4; see
http://httpd.apache.org/docs/2.4/developer/new_api_2_4.html#http_request

Signed-off-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
Steve Beattie 2014-07-09 14:15:11 -07:00
parent dd3df80f01
commit dd41f0ff87
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changehat/mod_apparmor/mod_apparmor.c
View File

@ -404,7 +404,15 @@ register_hooks(apr_pool_t *p)
{ {
ap_hook_post_config(aa_init, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_post_config(aa_init, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_child_init(aa_child_init, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_child_init(aa_child_init, NULL, NULL, APR_HOOK_MIDDLE);
#if AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER < 3
/* Compatibility with apache 2.2 */
ap_hook_access_checker(aa_enter_hat, NULL, NULL, APR_HOOK_FIRST); ap_hook_access_checker(aa_enter_hat, NULL, NULL, APR_HOOK_FIRST);
#else
/* apache 2.4 mod_authz hook */
ap_hook_check_access_ex(aa_enter_hat, NULL, NULL, APR_HOOK_FIRST, AP_AUTH_INTERNAL_PER_CONF);
#endif
/* ap_hook_post_read_request(aa_enter_hat, NULL, NULL, APR_HOOK_FIRST); */ /* ap_hook_post_read_request(aa_enter_hat, NULL, NULL, APR_HOOK_FIRST); */
ap_hook_log_transaction(aa_exit_hat, NULL, NULL, APR_HOOK_LAST); ap_hook_log_transaction(aa_exit_hat, NULL, NULL, APR_HOOK_LAST);
} }