X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsets.h;h=c02fd76c9249b2beb64726ee5a8573f064b3b88b;hb=410d51446154d4bcac1bd1c83b83892f4a75b9e7;hp=72be10f3cac0de9771f5d1c099e0e42c4ad50fa4;hpb=ac1332cdb868b6a30f545796aca8e0bbf13fe939;p=openldap

diff --git a/servers/slapd/sets.h b/servers/slapd/sets.h
index 72be10f3ca..c02fd76c92 100644
--- a/servers/slapd/sets.h
+++ b/servers/slapd/sets.h
@@ -1,22 +1,45 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
+#ifndef SLAP_SETS_H_
+#define SLAP_SETS_H_
+
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
+typedef struct slap_set_cookie {
+	struct slap_op *op;
+} SetCookie;
+
 /* this routine needs to return the bervals instead of
  * plain strings, since syntax is not known.  It should
  * also return the syntax or some "comparison cookie"
  * that is used by set_filter.
  */
 typedef BerVarray (SLAP_SET_GATHER)(
-	void *cookie, char *name, struct berval *attr);
+	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);
 
-LDAP_SLAPD_F (long) slap_set_size (BerVarray set);
-LDAP_SLAPD_F (void) slap_set_dispose (BerVarray set);
+LDAP_SLAPD_F (int) slap_set_filter(
+	SLAP_SET_GATHER gatherer,
+	SetCookie *cookie, struct berval *filter,
+	struct berval *user, struct berval *this, BerVarray *results);
 
-LDAP_SLAPD_F (int)
-slap_set_filter (SLAP_SET_GATHER gatherer,
-	void *cookie, struct berval *filter,
-	char *user, char *this, BerVarray *results);
+LDAP_END_DECL
 
+#endif