From ed2b8b311181b10d06a63f8321833a52e916db62 Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Thu, 9 Oct 2014 12:49:38 -0700 Subject: [PATCH] mod_apparmor: revert apache 2.4 api fix from commit 2131 This patch reverts commit 2131 which added support for the newer apache 2.4 ap_hook_check_access_ex() api, based on a report from Christian that it broke apache's simple authentication. Signed-off-by: Steve Beattie Acked-by: Christian Boltz --- changehat/mod_apparmor/mod_apparmor.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/changehat/mod_apparmor/mod_apparmor.c b/changehat/mod_apparmor/mod_apparmor.c index fa64f9776..e09b2fcdf 100644 --- a/changehat/mod_apparmor/mod_apparmor.c +++ b/changehat/mod_apparmor/mod_apparmor.c @@ -355,15 +355,7 @@ register_hooks (apr_pool_t *p) { ap_hook_post_config (immunix_init, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_child_init (immunix_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(immunix_enter_hat, NULL, NULL, APR_HOOK_FIRST); -#else - /* apache 2.4 mod_authz hook */ - ap_hook_check_access_ex(immunix_enter_hat, NULL, NULL, APR_HOOK_FIRST, AP_AUTH_INTERNAL_PER_CONF); -#endif - /* ap_hook_post_read_request(immunix_enter_hat, NULL, NULL, APR_HOOK_FIRST); */ ap_hook_log_transaction(immunix_exit_hat, NULL, NULL, APR_HOOK_LAST); }