From: Kurt Zeilenga Date: Tue, 29 Apr 2003 21:14:12 +0000 (+0000) Subject: cleanup X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~209 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=231f8464d1fae65a294830ccf6d17c6df9860f3f;p=openldap cleanup --- diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c index d5377a0908..30fb2dc2f1 100644 --- a/servers/slapd/acl.c +++ b/servers/slapd/acl.c @@ -135,9 +135,12 @@ access_allowed( assert( attr != NULL ); - if( op && op->o_is_auth_check && (access == ACL_SEARCH || access == ACL_READ)) { + if( op && op->o_is_auth_check && + ( access == ACL_SEARCH || access == ACL_READ )) + { access = ACL_AUTH; } + if( state && state->as_recorded && state->as_vd_ad==desc) { if( state->as_recorded & ACL_STATE_RECORDED_NV && val == NULL ) @@ -150,7 +153,9 @@ access_allowed( return state->as_result; } st_same_attr = 1; - } if (state) { + } + + if( state ) { state->as_vd_ad=desc; } @@ -259,8 +264,7 @@ access_allowed( a = state->as_vd_acl; mask = state->as_vd_acl_mask; count = state->as_vd_acl_count; - AC_MEMCPY( matches, state->as_vd_acl_matches, - sizeof(matches) ); + AC_MEMCPY( matches, state->as_vd_acl_matches, sizeof(matches) ); goto vd_access; } else {