Add OpenLDAP RCSid to *.[ch] in clients, libraries, and servers.

[openldap] / servers / slapd / back-bdb2 / proto-back-bdb2.h

diff --git a/servers/slapd/back-bdb2/proto-back-bdb2.h b/servers/slapd/back-bdb2/proto-back-bdb2.h
index 78e853c7d339392110c913d7c6eb520014802aa1..befba8b8abc33e1596444301a06c6dd304358a68 100644 (file)
--- a/servers/slapd/back-bdb2/proto-back-bdb2.h
+++ b/servers/slapd/back-bdb2/proto-back-bdb2.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef _PROTO_BACK_BDB2
 #define _PROTO_BACK_BDB2
 
@@ -9,19 +10,27 @@
 
 LDAP_BEGIN_DECL
 
+/*
+ * add.c
+ */
+int bdb2i_release_add_lock LDAP_P(());
+
 /*
  * alias.c
  */
-Entry *bdb2i_derefAlias_r LDAP_P((
-       BackendDB   *be,
-       Connection      *conn,
-       Operation       *op,
-       Entry       *e ));
-char *bdb2i_derefDN LDAP_P((
-       BackendDB   *be,
-       Connection  *conn,
-       Operation   *op,
-       char        *dn ));
+
+Entry * bdb2i_deref_r LDAP_P((
+       Backend *be,
+       Entry *e,
+       char *dn,
+       int *err,
+       Entry **matched,
+       char **text ));
+
+#define deref_entry_r( be, e, err, matched, text ) \
+       bdb2i_deref_r( be, e, NULL, err, matched, text )
+#define deref_dn_r( be, dn, err, matched, text ) \
+       bdb2i_deref_r( be, NULL, dn, err, matched, text )
 
 /*
  * attr.c
@@ -29,7 +38,8 @@ char *bdb2i_derefDN LDAP_P((
 
 void bdb2i_attr_masks LDAP_P(( struct ldbminfo *li, char *type, int *indexmask,
  int *syntaxmask ));
-void bdb2i_attr_index_config LDAP_P(( struct ldbminfo *li, char *fname,
+void bdb2i_attr_index_config LDAP_P(( struct ldbminfo *li,
+ const char *fname,
  int lineno, int argc, char **argv, int init ));
 
 /*
@@ -44,7 +54,7 @@ void bdb2i_cache_return_entry_rw LDAP_P(( struct cache *cache, Entry *e,
 #define bdb2i_cache_return_entry_w(c, e) bdb2i_cache_return_entry_rw((c), (e), 1)
 
 ID bdb2i_cache_find_entry_dn2id LDAP_P(( BackendDB *be, struct cache *cache,
- char *dn ));
+ const char *dn ));
 Entry * bdb2i_cache_find_entry_id LDAP_P(( struct cache *cache, ID id, int rw ));
 int bdb2i_cache_delete_entry LDAP_P(( struct cache *cache, Entry *e ));
 
@@ -65,15 +75,30 @@ int bdb2i_cache_delete LDAP_P(( struct dbcache *db, Datum key ));
  * dn2id.c
  */
 
-int bdb2i_dn2id_add LDAP_P(( BackendDB *be, char *dn, ID id ));
-ID bdb2i_dn2id LDAP_P(( BackendDB *be, char *dn ));
-int bdb2i_dn2id_delete LDAP_P(( BackendDB *be, char *dn ));
+int bdb2i_dn2id_add LDAP_P(( BackendDB *be, const char *dn, ID id ));
+ID bdb2i_dn2id LDAP_P(( BackendDB *be, const char *dn ));
+int bdb2i_dn2id_delete LDAP_P(( BackendDB *be, const char *dn, ID id ));
+
+ID_BLOCK *
+bdb2i_dn2idl LDAP_P((
+    BackendDB  *be,
+    const char *dn,
+       int     prefix ));
+
+Entry * bdb2i_dn2entry_rw LDAP_P((
+       BackendDB *be,
+       const char *dn,
+       Entry **matched,
+       int rw ));
 
-Entry * bdb2i_dn2entry_rw LDAP_P(( BackendDB *be, char *dn, char **matched,
- int rw ));
 #define bdb2i_dn2entry_r(be, dn, m) bdb2i_dn2entry_rw((be), (dn), (m), 0)
 #define bdb2i_dn2entry_w(be, dn, m) bdb2i_dn2entry_rw((be), (dn), (m), 1)
 
+/*
+ * entry.c
+ */
+int bdb2_back_entry_release_rw LDAP_P(( BackendDB *be, Entry *e, int rw ));
+
 /*
  * filterindex.c
  */
@@ -84,8 +109,6 @@ ID_BLOCK * bdb2i_filter_candidates LDAP_P(( BackendDB *be, Filter *f ));
  * id2children.c
  */
 
-int bdb2i_id2children_add LDAP_P(( BackendDB *be, Entry *p, Entry *e ));
-int bdb2i_id2children_remove LDAP_P(( BackendDB *be, Entry *p, Entry *e ));
 int bdb2i_has_children LDAP_P(( BackendDB *be, Entry *p ));
 
 /*
@@ -113,8 +136,8 @@ int bdb2i_idl_delete_key LDAP_P(( BackendDB *be, struct dbcache *db, Datum key,
 ID_BLOCK * bdb2i_idl_intersection LDAP_P(( BackendDB *be, ID_BLOCK *a, ID_BLOCK *b ));
 ID_BLOCK * bdb2i_idl_union LDAP_P(( BackendDB *be, ID_BLOCK *a, ID_BLOCK *b ));
 ID_BLOCK * bdb2i_idl_notin LDAP_P(( BackendDB *be, ID_BLOCK *a, ID_BLOCK *b ));
-ID bdb2i_idl_firstid LDAP_P(( ID_BLOCK *idl ));
-ID bdb2i_idl_nextid LDAP_P(( ID_BLOCK *idl, ID id ));
+ID bdb2i_idl_firstid LDAP_P(( ID_BLOCK *idl, ID *cursor ));
+ID bdb2i_idl_nextid LDAP_P(( ID_BLOCK *idl, ID *cursor ));
 
 /*
  * index.c
@@ -137,12 +160,19 @@ int bdb2i_index_add_values LDAP_P(( BackendDB *be, char *type, struct berval **v
  * modify.c
  * These prototypes are placed here because they are used by modify and
  * modify rdn which are implemented in different files. 
+ *
+ * We need bdb2i_back_modify_internal here because of LDAP modrdn & modify use 
+ * it. If we do not add this, there would be a bunch of code replication 
+ * here and there and of course the likelihood of bugs increases.
+ * Juan C. Gomez (gomez@engr.sgi.com) 05/18/99
+ *
  */
 
 int bdb2i_add_values LDAP_P(( Entry *e, LDAPMod *mod, char *dn ));
 int bdb2i_delete_values LDAP_P(( Entry *e, LDAPMod *mod, char *dn ));
 int bdb2i_replace_values LDAP_P(( Entry *e, LDAPMod *mod, char *dn ));
-
+int bdb2i_back_modify_internal LDAP_P((Backend *be, Connection *conn, Operation *op,
+                                char *dn, LDAPModList *mods, Entry *e));
 /*
  * nextid.c
  */