Merged files from branch REGEX_REMOVAL. Despite name, this merge

[openldap] / servers / slapd / proto-slap.h

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index a1ff6e5e755cb202ec1fb25028591eb53c45af47..300b76aa6beb8492011c54a4c10059ffee6d87c8 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -7,10 +7,13 @@
 
 int access_allowed( Backend *be, Connection *conn, Operation *op, Entry *e,
        char *attr, struct berval *val, char *dn, int  access );
+
 struct acl * acl_get_applicable( Backend *be, Operation *op, Entry *e,
-       char *attr );
+       char *attr, char *edn, int nmatches, regmatch_t *matches );
 int acl_access_allowed( struct acl *a, Backend *be, Connection *conn, Entry *e,
-       struct berval *val, Operation *op, int  access );
+       struct berval *val, Operation *op, int  access, char *edn,
+       regmatch_t *matches );
+
 int acl_check_mods( Backend *be, Connection *conn, Operation *op, Entry *e,
        LDAPMod *mods );