Do not return pointers into BerElement we do not own

[openldap] / servers / slapd / slapi / slapi.h

diff --git a/servers/slapd/slapi/slapi.h b/servers/slapd/slapi/slapi.h
index e7e7718d17fc054eeeb77c8f06e82d672592a052..0766b89fad65906218beb27058f3e133a1263b2c 100644 (file)
--- a/servers/slapd/slapi/slapi.h
+++ b/servers/slapd/slapi/slapi.h
@@ -10,6 +10,8 @@
  * without express or implied warranty.
  */
 
+#ifdef LDAP_SLAPI /* SLAPI is OPTIONAL */
+
 #ifndef _SLAPI_H
 #define _SLAPI_H
 
@@ -52,8 +54,7 @@ LDAP_BEGIN_DECL
 
 extern int slap_debug;
 
-int
-dn_check(char *, int *);
+extern int dn_check(char *, int *);
 
 typedef struct strlist {
        char *string;
@@ -61,6 +62,7 @@ typedef struct strlist {
 } StrList;
 #endif
 
+extern struct berval *ns_get_supported_extop( int );
 
 /*
  * Was: slapi_utils.h
@@ -173,16 +175,16 @@ struct slapi_pblock {
 #define CL_DELRDN "deleteoldrdn"
 #define CHANGE_INITIATOR "ibm-changeInitiatorsName" 
 
-void slapi_register_changelog_suffix(char *suffix);
-char **slapi_get_changelog_suffixes();
-void slapi_update_changelog_counters(long curNum, long numEntries);
-char *slapi_get_cl_firstNum();
-char *slapi_get_cl_lastNum();
-int slapi_add_to_changelog(Slapi_Entry *ent, char *suffix, char *chNum, Operation* op);        
-int slapi_delete_changelog(char *dn, char *suffix, char *chNum, Operation* op);        
-int slapi_modify_changelog(char *dn,LDAPMod    *mods,char *suffix, char *chNum, Operation* op); 
-int slapi_modifyrdn_changelog(char *olddn, char *newRdn, int delRdn, char *suffix, char *chNum, Operation* op);
-Backend * slapi_cl_get_be(char *dn);
+extern void slapi_register_changelog_suffix(char *suffix);
+extern char **slapi_get_changelog_suffixes();
+extern void slapi_update_changelog_counters(long curNum, long numEntries);
+extern char *slapi_get_cl_firstNum();
+extern char *slapi_get_cl_lastNum();
+extern int slapi_add_to_changelog(Slapi_Entry *ent, char *suffix, char *chNum, Operation* op); 
+extern int slapi_delete_changelog(char *dn, char *suffix, char *chNum, Operation* op); 
+extern int slapi_modify_changelog(char *dn,LDAPMod     *mods,char *suffix, char *chNum, Operation* op); 
+extern int slapi_modifyrdn_changelog(char *olddn, char *newRdn, int delRdn, char *suffix, char *chNum, Operation* op);
+extern Backend * slapi_cl_get_be(char *dn);
 #endif
 
 
@@ -526,4 +528,4 @@ LDAP_END_DECL
 #include "proto-slapi.h"
 
 #endif /* _SLAPI_H */
-
+#endif /* LDAP_SLAPI */