/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2009 The OpenLDAP Foundation.
+ * Copyright 1998-2010 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
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;
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",
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 );
* 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 ); \
}
} 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;