Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / sets.h

diff --git a/servers/slapd/sets.h b/servers/slapd/sets.h
index 2887a6d0c7f6636332e10e7a81eb528dcd5cd57d..9b14b653c203e0d745dca7cbf737f39df71043c0 100644 (file)
--- a/servers/slapd/sets.h
+++ b/servers/slapd/sets.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,7 +21,7 @@
 LDAP_BEGIN_DECL
 
 typedef struct slap_set_cookie {
-       struct slap_op *op;
+       Operation *set_op;
 } SetCookie;
 
 /* this routine needs to return the bervals instead of
@@ -29,19 +29,46 @@ typedef struct slap_set_cookie {
  * also return the syntax or some "comparison cookie"
  * that is used by set_filter.
  */
-typedef BerVarray (SLAP_SET_GATHER)(
-       SetCookie *cookie, struct berval *name, struct berval *attr);
-
-LDAP_SLAPD_F (long) slap_set_size(BerVarray set);
-LDAP_SLAPD_F (void) slap_set_dispose(SetCookie *cookie, BerVarray set);
+typedef BerVarray (SLAP_SET_GATHER)( SetCookie *cookie,
+               struct berval *name, AttributeDescription *ad);
 
 LDAP_SLAPD_F (int) slap_set_filter(
        SLAP_SET_GATHER gatherer,
        SetCookie *cookie, struct berval *filter,
-       struct berval *user, struct berval *this, BerVarray *results);
+       struct berval *user, struct berval *target, BerVarray *results);
+
+LDAP_SLAPD_F (BerVarray) slap_set_join(SetCookie *cp,
+       BerVarray lset, unsigned op, BerVarray rset);
+
+#define SLAP_SET_OPMASK                0x00FF
 
-LDAP_SLAPD_F (BerVarray) slap_set_join(SetCookie *cp, BerVarray lset,
-       int op, BerVarray rset);
+#define SLAP_SET_REFARR                0x0100
+#define SLAP_SET_REFVAL                0x0200
+#define SLAP_SET_REF           (SLAP_SET_REFARR|SLAP_SET_REFVAL)
+
+/* The unsigned "op" can be ORed with the flags below;
+ * - if the rset's values must not be freed, or must be copied if kept,
+ *   it is ORed with SLAP_SET_RREFVAL
+ * - if the rset array must not be freed, or must be copied if kept,
+ *   it is ORed with SLAP_SET_RREFARR
+ * - the same applies to the lset with SLAP_SET_LREFVAL and SLAP_SET_LREFARR
+ * - it is assumed that SLAP_SET_REFVAL implies SLAP_SET_REFARR,
+ *   i.e. the former is checked only if the latter is set.
+ */
+
+#define SLAP_SET_RREFARR       SLAP_SET_REFARR
+#define SLAP_SET_RREFVAL       SLAP_SET_REFVAL
+#define SLAP_SET_RREF          SLAP_SET_REF
+#define SLAP_SET_RREFMASK      0x0F00
+
+#define SLAP_SET_RREF2REF(r)   ((r) & SLAP_SET_RREFMASK)
+       
+#define SLAP_SET_LREFARR       0x1000
+#define SLAP_SET_LREFVAL       0x2000
+#define SLAP_SET_LREF          (SLAP_SET_LREFARR|SLAP_SET_LREFVAL)
+#define SLAP_SET_LREFMASK      0xF000
+       
+#define SLAP_SET_LREF2REF(r)   (((r) & SLAP_SET_LREFMASK) >> 4)
        
 LDAP_END_DECL