From c74a92fe5098758dabb51f02e8a04132c27178f4 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 9 Aug 2008 12:27:57 +0000 Subject: [PATCH] fix continuation checking in dynacl (ITS#5637) --- servers/slapd/acl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c index 2d959190cc..7f97d57cf4 100644 --- a/servers/slapd/acl.c +++ b/servers/slapd/acl.c @@ -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 ); -- 2.39.5