This commit is contained in:
Kurt Zeilenga 2003-04-29 21:14:12 +00:00
parent 23b63aac39
commit 231f8464d1

View File

@ -135,9 +135,12 @@ access_allowed(
assert( attr != NULL ); 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; access = ACL_AUTH;
} }
if( state && state->as_recorded && state->as_vd_ad==desc) { if( state && state->as_recorded && state->as_vd_ad==desc) {
if( state->as_recorded & ACL_STATE_RECORDED_NV && if( state->as_recorded & ACL_STATE_RECORDED_NV &&
val == NULL ) val == NULL )
@ -150,7 +153,9 @@ access_allowed(
return state->as_result; return state->as_result;
} }
st_same_attr = 1; st_same_attr = 1;
} if (state) { }
if( state ) {
state->as_vd_ad=desc; state->as_vd_ad=desc;
} }
@ -259,8 +264,7 @@ access_allowed(
a = state->as_vd_acl; a = state->as_vd_acl;
mask = state->as_vd_acl_mask; mask = state->as_vd_acl_mask;
count = state->as_vd_acl_count; count = state->as_vd_acl_count;
AC_MEMCPY( matches, state->as_vd_acl_matches, AC_MEMCPY( matches, state->as_vd_acl_matches, sizeof(matches) );
sizeof(matches) );
goto vd_access; goto vd_access;
} else { } else {