[apparmor] [patch 2.8] mod_apparmor: revert apache 2.4 api fix

[Steve Beattie]

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 <steve at nxnw.org>

[I will wait for testing feedback from Christian before considering
 applying it.]


---
 changehat/mod_apparmor/mod_apparmor.c |    8 --------
 1 file changed, 8 deletions(-)

Index: b/changehat/mod_apparmor/mod_apparmor.c
===================================================================
--- 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);
 }

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20141006/6dc0e86b/attachment.pgp>