*) Fix mis-shifted 32 bit scope, masked to 64 bits as a method.

     [Will Rowe, Joe Orton]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@390495 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ed9d9deea4db1c4e1749f0691aafe5a2df6cdb30..ce6cb1513a0b42231ae2a855bbcf5a5fe89b9b6a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.1
 
+  *) Fix mis-shifted 32 bit scope, masked to 64 bits as a method.
+     [Will Rowe, Joe Orton]
+
   *) mod_proxy: Fix KeepAlives not being allowed and set to
        backend servers. PR38602. [Ruediger Pluem, Jim Jagielski]
 

diff --git a/STATUS b/STATUS
index 1212b9737586590c915a5345b94e98c314db25ed..bcbf9b71402cf7db84f2b237f3629cab23565b63 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -92,11 +92,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       +1: rpluem, niq, jerenkrantz
       NOTE: this also supersedes previous fix to PR#37790
 
-    * Fix mis-shifted 32 bit scope, masked to 64 bits as a method, with
-      improvement (?) suggested by jorton;
-        URL: http://people.apache.org/~wrowe/fixldap_mask.patch
-      +1: wrowe, pquerna, jim, jorton
-
     * mod_ldap: Fix a race condition when creating the connection pool mutex
        and make sure that memory is being allocated from the correct pools
        when connections are being established. Enforce the GLOBAL_ONLY 

diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index 586f80bf433b48fb49bfc4213fbcbba310fd5b81..48d446b2fc5d82321635a81f5f6d93413b5fb6b3 100644 (file)
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -576,7 +576,7 @@ static int authz_ldap_check_user_access(request_rec *r)
     /* Loop through the requirements array until there's no elements
      * left, or something causes a return from inside the loop */
     for(x=0; x < reqs_arr->nelts; x++) {
-        if (! (reqs[x].method_mask & (1 << m))) {
+        if (! (reqs[x].method_mask & (AP_METHOD_BIT << m))) {
             continue;
         }
         method_restricted = 1;