Plug mutex/rwlock leaks (destroy them)

[openldap] / servers / slapd / acl.c

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index d076ad0b62968fda06fc745753648d611707c4c2..8ea26c13454c0cc79e205e9e9e0c6d3f67683ab5 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -220,7 +220,7 @@ slap_access_allowed(
                state = &acl_state;
        if ( state->as_desc == desc &&
                state->as_access == access &&
-               state->as_vd_acl != NULL )
+               state->as_vd_acl_present )
        {
                a = state->as_vd_acl;
                count = state->as_vd_acl_count;
@@ -405,7 +405,7 @@ access_allowed_mask(
                if ( state->as_desc == desc &&
                        state->as_access == access &&
                        state->as_result != -1 &&
-                       state->as_vd_acl == NULL )
+                       !state->as_vd_acl_present )
                        {
                        Debug( LDAP_DEBUG_ACL,
                                "=> access_allowed: result was in cache (%s)\n",
@@ -615,7 +615,8 @@ slap_acl_get(
                                continue;
                        }
 
-                       if ( state->as_vd_acl == NULL ) {
+                       if ( !state->as_vd_acl_present ) {
+                               state->as_vd_acl_present = 1;
                                state->as_vd_acl = prev;
                                state->as_vd_acl_count = *count - 1;
                                ACL_PRIV_ASSIGN ( state->as_vd_mask, *mask );
@@ -714,7 +715,8 @@ slap_acl_get(
  * Record value-dependent access control state
  */
 #define ACL_RECORD_VALUE_STATE do { \
-               if( state && state->as_vd_acl == NULL ) { \
+               if( state && !state->as_vd_acl_present ) { \
+                       state->as_vd_acl_present = 1; \
                        state->as_vd_acl = a; \
                        state->as_vd_acl_count = count; \
                        ACL_PRIV_ASSIGN( state->as_vd_mask, *mask ); \
@@ -2132,7 +2134,16 @@ acl_set_cb_gather( Operation *op, SlapReply *rs )
                }
 
        } else {
-               assert( rs->sr_type == REP_RESULT );
+               switch ( rs->sr_type ) {
+               case REP_SEARCHREF:
+               case REP_INTERMEDIATE:
+                       /* ignore */
+                       break;
+
+               default:
+                       assert( rs->sr_type == REP_RESULT );
+                       break;
+               }
        }
 
        return 0;