upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-06 06:59:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix continuation checking in dynacl (ITS#5637)

Browse source
This commit is contained in:
Pierangelo Masarati 2008-08-09 12:27:57 +00:00
parent 7bef2ffdf6
commit c74a92fe50
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
servers/slapd/acl.c
View file

@ -63,7 +63,8 @@ static slap_control_t slap_acl_mask(
int nmatch,
regmatch_t *matches,
int count,
AccessControlState *state );
AccessControlState *state,
slap_access_t access );
static int regex_matches(
struct berval *pat, char *str, char *buf,
@ -246,7 +247,7 @@ slap_access_allowed(
}
control = slap_acl_mask( a, &mask, op,
e, desc, val, MAXREMATCHES, matches, count, state );
e, desc, val, MAXREMATCHES, matches, count, state, access );
if ( control != ACL_BREAK ) {
break;
@ -1053,7 +1054,8 @@ slap_acl_mask(
int nmatch,
regmatch_t *matches,
int count,
AccessControlState *state )
AccessControlState *state,
slap_access_t access )
{
int i;
Access *b;
@ -1061,7 +1063,7 @@ slap_acl_mask(
char accessmaskbuf[ACCESSMASK_MAXLEN];
#endif /* DEBUG */
const char *attr;
slap_mask_t a2pmask = ACL_ACCESS2PRIV( *mask );
slap_mask_t a2pmask = ACL_ACCESS2PRIV( access );
assert( a != NULL );
assert( mask != NULL );
@ -1790,8 +1792,6 @@ slap_acl_mask(
*mask = modmask;
}
a2pmask = *mask;
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] mask: %s\n",
i, accessmask2str(*mask, accessmaskbuf, 1), 0 );