Add a safety check to bvcasechr

[openldap] / servers / slapd / sets.h

diff --git a/servers/slapd/sets.h b/servers/slapd/sets.h
index 9f36f34680c915cc67846bcf1a65811e86aa06ca..2478790080bb84034750c9840dd88468de335239 100644 (file)
--- a/servers/slapd/sets.h
+++ b/servers/slapd/sets.h
@@ -4,19 +4,29 @@
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
+#ifndef SLAP_SETS_H_
+#define SLAP_SETS_H_
+
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
 /* 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 BVarray (SLAP_SET_GATHER)(
+typedef BerVarray (SLAP_SET_GATHER)(
        void *cookie, char *name, struct berval *attr);
 
-LDAP_SLAPD_F (long) slap_set_size (BVarray set);
-LDAP_SLAPD_F (void) slap_set_dispose (BVarray 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,
        void *cookie, struct berval *filter,
-       char *user, char *this, BVarray *results);
+       char *user, char *this, BerVarray *results);
+
+LDAP_END_DECL
 
+#endif
\ No newline at end of file