mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

complete ACI commit

Browse Source
This commit is contained in:
Pierangelo Masarati 2006-01-06 17:28:59 +00:00
parent 8ebdb57b37
commit e484ebf9c8
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/slapd/aci.c
View File

@ -49,6 +49,12 @@
/* change this to "OpenLDAPset" */ /* change this to "OpenLDAPset" */
#define SLAPD_ACI_SET_ATTR "template" #define SLAPD_ACI_SET_ATTR "template"
typedef enum slap_aci_scope_t {
SLAP_ACI_SCOPE_ENTRY = 0x1,
SLAP_ACI_SCOPE_CHILDREN = 0x2,
SLAP_ACI_SCOPE_SUBTREE = ( SLAP_ACI_SCOPE_ENTRY | SLAP_ACI_SCOPE_CHILDREN )
} slap_aci_scope_t;
enum { enum {
ACI_BV_ENTRY, ACI_BV_ENTRY,
ACI_BV_CHILDREN, ACI_BV_CHILDREN,

18
servers/slapd/slap.h
View File

@ -1432,16 +1432,6 @@ typedef struct slap_access {
#ifdef SLAP_DYNACL #ifdef SLAP_DYNACL
slap_dynacl_t *a_dynacl; slap_dynacl_t *a_dynacl;
#else /* ! SLAP_DYNACL */
#ifdef SLAPD_ACI_ENABLED
/* NOTE: ACIs have been moved under the "dynacl" interface,
* which is currently built only when LDAP_DEVEL is defined.
*
* In any case, SLAPD_ACI_ENABLED, set by --enable-aci,
* is required to enable ACI support.
*/
AttributeDescription *a_aci_at;
#endif /* SLAPD_ACI_ENABLED */
#endif /* SLAP_DYNACL */ #endif /* SLAP_DYNACL */
/* ACL Groups */ /* ACL Groups */
@ -1498,14 +1488,6 @@ typedef struct slap_acl_state {
#define ACL_STATE_INIT { ACL_STATE_NOT_RECORDED, NULL, NULL, 0UL, \ #define ACL_STATE_INIT { ACL_STATE_NOT_RECORDED, NULL, NULL, 0UL, \
{ { 0, 0 } }, 0, NULL, 0, 0, NULL } { { 0, 0 } }, 0, NULL, 0, 0, NULL }
#ifdef SLAPD_ACI_ENABLED
typedef enum slap_aci_scope_t {
SLAP_ACI_SCOPE_ENTRY = 0x1,
SLAP_ACI_SCOPE_CHILDREN = 0x2,
SLAP_ACI_SCOPE_SUBTREE = ( SLAP_ACI_SCOPE_ENTRY | SLAP_ACI_SCOPE_CHILDREN )
} slap_aci_scope_t;
#endif /* SLAPD_ACI_ENABLED */
/* /*
* Backend-info * Backend-info
* represents a backend * represents a backend