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 d13cb6fa8678dba88310852a3be8fd43b624cbd9..0766b89fad65906218beb27058f3e133a1263b2c 100644 (file)
--- a/servers/slapd/slapi/slapi.h
+++ b/servers/slapd/slapi/slapi.h
@@ -10,30 +10,30 @@
  * without express or implied warranty.
  */
 
+#ifdef LDAP_SLAPI /* SLAPI is OPTIONAL */
+
 #ifndef _SLAPI_H
 #define _SLAPI_H
 
 #include <ibm_pblock_params.h> 
 
+LDAP_BEGIN_DECL
+
+/*
+ * Quick 'n' dirty to make struct slapi_* in slapi-plugin.h opaque
+ */
 #define slapi_entry    slap_entry
 #define slapi_attr     slap_attr
+#define slapi_value    berval
+#define slapi_valueset berval*
 #define slapi_filter   slap_filter
+
+LDAP_END_DECL
+
 #include <slapi-plugin.h>
 
 LDAP_BEGIN_DECL
 
-/*
- * Generic typedefs
- */
-#if 0
-typedef struct slapi_pblock    Slapi_PBlock;
-typedef struct slap_entry      Slapi_Entry;
-typedef struct slap_attr       Slapi_Attr;
-typedef struct berval          Slapi_Value;
-typedef BerVarray              Slapi_ValueSet;
-typedef Filter                 Slapi_Filter;
-#endif
-
 /*
  * Was: slapi_common.h
  */
@@ -47,24 +47,22 @@ typedef Filter                      Slapi_Filter;
 #define FALSE 0
 #endif
 
-#if 0
-
+#if 0  /* unused (yet?) */
 #define dn_normalize_case      dn_normalize
 #define SLAPD_NO_MEMORY        7
 #define ANYBODY_STRING                 "CN=ANYBODY"
 
 extern int slap_debug;
 
-int
-dn_check(char *, int *);
+extern int dn_check(char *, int *);
 
 typedef struct strlist {
        char *string;
        struct strlist *next;
 } StrList;
-
 #endif
 
+extern struct berval *ns_get_supported_extop( int );
 
 /*
  * Was: slapi_utils.h
@@ -77,7 +75,7 @@ typedef struct _Audit_record Audit_record;
 
 typedef int (*SLAPI_FUNC)( Slapi_PBlock *pb );
 
-#if 0
+#if 0  /* unused (yet?) */
 #define DOMAIN "Domain"
 #define TCPIPPATH "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"
 #endif
@@ -118,9 +116,9 @@ struct _computed_attr_context {
  * Was: slapi_pblock.h
  */
 
-#ifndef NO_PBLOCK_CLASS
+#ifndef NO_PBLOCK_CLASS                /* where's this test from? */
 
-#if 0
+#if 0  /* unused (yet?) */
 #define CMP_EQUAL                      0
 #define CMP_GREATER                    1
 #define CMP_LOWER                      (-1)
@@ -145,16 +143,51 @@ struct slapi_pblock {
 
 #define SLAPI_PLUGIN_IS_POST_FN(x) ((x) >= SLAPI_PLUGIN_POST_BIND_FN && (x) <= SLAPI_PLUGIN_POST_RESULT_FN)
 
+/*
+ * Was: slapi_cl.h
+ */
+
 #if 0
-#include <slapi_utils.h.h>
-#include <slapi_pblock.h>
-#include <plugin.h>
-#include <slapi_ops.h>
-#if 0 /* unused (yet?) */
-#include <slapi_cl.h>
-#endif /* 0 */
+#define TIME_SIZE 20
+#define OBJECTCLASS "objectclass"
+#define TOP "top"
+#define CHANGE_TIME "changetime"
+#define CHANGE_TYPE "changetype"
+#define CHANGE_TARGETDN "targetdn"
+#define CHANGES        "changes"
+#define CHANGE_NUMBER "changenumber"
+/*
+ * FIXME: I get complaints like "ADD" being redefined - first definition
+ * being in "/usr/include/arpa/nameser.h:552"
+ */
+#undef ADD
+#define ADD "add: "
+#define ADDLEN 5
+#define DEL "delete: "
+#define DELLEN 8
+#define REPLACE "replace: "
+#define REPLEN 9
+#define MOD "modify"
+#define MODRDN "modrdn"
+#define CHANGE_LOGENTRY "changelogentry"
+#define IBM_CHANGE_LOGENTRY "ibm-changelog"
+#define CL_NEWRDN "newrdn"
+#define CL_DELRDN "deleteoldrdn"
+#define CHANGE_INITIATOR "ibm-changeInitiatorsName" 
+
+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
 
+
 /*
  * Attribute flags returned by slapi_attr_get_flags()
  */
@@ -495,4 +528,4 @@ LDAP_END_DECL
 #include "proto-slapi.h"
 
 #endif /* _SLAPI_H */
-
+#endif /* LDAP_SLAPI */