upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 16:49:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix previous commit (related to ITS#5804)

Browse source
This commit is contained in:
Pierangelo Masarati 2008-11-15 10:42:18 +00:00
parent ec8d0d6de1
commit a86fae235b
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/slapd/acl.c
View file

@ -120,7 +120,7 @@ slap_access_always_allowed(
( sizeof ( (m)->dn_data ) / sizeof( *(m)->dn_data ) )
#define MATCHES_VALMAXCOUNT(m) \
( sizeof ( (m)->val_data ) / sizeof( *(m)->val_data ) )
#define MATCHES_MEMSET(m) { \
#define MATCHES_MEMSET(m) do { \
memset( (m)->dn_data, '\0', sizeof( (m)->dn_data ) ); \
memset( (m)->val_data, '\0', sizeof( (m)->val_data ) ); \
(m)->dn_count = MATCHES_DNMAXCOUNT( (m) ); \
@ -1809,7 +1809,7 @@ slap_acl_mask(
* an API update
*/
(void)da->da_mask( da->da_private, op, e, desc,
val, matches.dn_count, matches.dn_data,
val, matches->dn_count, matches->dn_data,
&grant, &deny );
tgrant |= grant;

7
servers/slapd/proto-slap.h
View file

@ -46,13 +46,6 @@ LDAP_SLAPD_F (int) dynacl_aci_init LDAP_P(( void ));
/*
* acl.c
*/
typedef struct AclRegexMatches {
int dn_count;
regmatch_t dn_data[MAXREMATCHES];
int val_count;
regmatch_t val_data[MAXREMATCHES];
} AclRegexMatches;
LDAP_SLAPD_F (int) access_allowed_mask LDAP_P((
Operation *op,
Entry *e, AttributeDescription *desc, struct berval *val,

7
servers/slapd/slap.h
View file

@ -1547,6 +1547,13 @@ typedef struct AccessControlState {
#define ACL_STATE_INIT { NULL, NULL, NULL, \
ACL_STATE_NOT_RECORDED, 0, 0, 0 }
typedef struct AclRegexMatches {
int dn_count;
regmatch_t dn_data[MAXREMATCHES];
int val_count;
regmatch_t val_data[MAXREMATCHES];
} AclRegexMatches;
/*
* Backend-info
* represents a backend