mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in SLAPI ACL plugins owing to accidental commit

Browse Source 
Support ACL_WADD/ACL_WDEL in SLAPI ACL evaluation/plugins
This commit is contained in:
Luke Howard 2005-07-20 08:00:24 +00:00
parent 25ae11ccd9
commit f12103f36b
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
servers/slapd/slapi/slapi_utils.c
View File

@ -3382,16 +3382,20 @@ int slapi_access_allowed( Slapi_PBlock *pb, Slapi_Entry *e, char *attr,
Backend *be;
Connection *conn;
Operation *op;
int ret;
int rc;
slap_access_t slap_access;
AttributeDescription *ad = NULL;
const char *text;
ret = slap_str2ad( attr, &ad, &text );
if ( ret != LDAP_SUCCESS ) {
return ret;
rc = slap_str2ad( attr, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
return rc;
}
/*
* Whilst the SLAPI access types are arranged as a bitmask, the
* documentation indicates that they are to be used separately.
*/
switch ( access & SLAPI_ACL_ALL ) {
case SLAPI_ACL_COMPARE:
slap_access = ACL_COMPARE;
@ -3403,12 +3407,16 @@ int slapi_access_allowed( Slapi_PBlock *pb, Slapi_Entry *e, char *attr,
slap_access = ACL_READ;
break;
case SLAPI_ACL_WRITE:
case SLAPI_ACL_DELETE:
case SLAPI_ACL_ADD:
case SLAPI_ACL_SELF:
/* FIXME: handle ACL_WADD/ACL_WDEL */
slap_access = ACL_WRITE;
break;
case SLAPI_ACL_DELETE:
slap_access = ACL_WDEL;
break;
case SLAPI_ACL_ADD:
slap_access = ACL_WADD;
break;
case SLAPI_ACL_SELF: /* not documented */
case SLAPI_ACL_PROXY: /* not documented */
default:
return LDAP_INSUFFICIENT_ACCESS;
break;
@ -3426,9 +3434,11 @@ int slapi_access_allowed( Slapi_PBlock *pb, Slapi_Entry *e, char *attr,
return LDAP_PARAM_ERROR;
}
ret = access_allowed( op, e, ad, val, slap_access, NULL );
if ( access_allowed( op, e, ad, val, slap_access, NULL ) ) {
return LDAP_SUCCESS;
}
return ret ? LDAP_SUCCESS : LDAP_INSUFFICIENT_ACCESS;
return LDAP_INSUFFICIENT_ACCESS;
#else
return LDAP_UNWILLING_TO_PERFORM;
#endif
@ -4040,21 +4050,24 @@ int slapi_int_access_allowed( Operation *op,
return 1;
}
return 1;
switch ( access ) {
case ACL_WRITE:
/* FIXME: handle ACL_WADD/ACL_WDEL */
slap_access |= SLAPI_ACL_ADD | SLAPI_ACL_DELETE | SLAPI_ACL_WRITE;
break;
case ACL_READ:
slap_access |= SLAPI_ACL_READ;
case ACL_COMPARE:
slap_access |= SLAPI_ACL_COMPARE;
break;
case ACL_SEARCH:
slap_access |= SLAPI_ACL_SEARCH;
break;
case ACL_COMPARE:
slap_access = ACL_COMPARE;
case ACL_READ:
slap_access |= SLAPI_ACL_READ;
break;
case ACL_WRITE:
slap_access |= SLAPI_ACL_WRITE;
break;
case ACL_WDEL:
slap_access |= SLAPI_ACL_DELETE;
break;
case ACL_WADD:
slap_access |= SLAPI_ACL_ADD;
break;
default:
break;