Remove abandon cruft

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

diff --git a/servers/slapd/back-ldbm/proto-back-ldbm.h b/servers/slapd/back-ldbm/proto-back-ldbm.h
index 888aeedb9d22d9692142bd0c4a29591ba02e4c94..4433f736cf2fff43f4af95596ed7f0344c838d13 100644 (file)
--- a/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -19,7 +19,7 @@ LDAP_BEGIN_DECL
 Entry *deref_internal_r LDAP_P((
        Backend *be,
        Entry *e,
-       const char *dn,
+       struct berval *dn,
        int *err,
        Entry **matched,
        const char **text ));
@@ -33,10 +33,13 @@ Entry *deref_internal_r LDAP_P((
  * attr.c
  */
 
-void attr_mask LDAP_P(( struct ldbminfo *li, const char *type, int *indexmask ));
-void attr_index_config LDAP_P(( struct ldbminfo *li,
+void attr_mask LDAP_P(( struct ldbminfo *li,
+       AttributeDescription *desc,
+       slap_mask_t *indexmask ));
+
+int attr_index_config LDAP_P(( struct ldbminfo *li,
        const char *fname, int lineno,
-       int argc, char **argv, int init ));
+       int argc, char **argv ));
 void attr_index_destroy LDAP_P(( Avlnode *tree ));
 
 /*
@@ -48,8 +51,10 @@ int cache_update_entry LDAP_P(( Cache *cache, Entry *e ));
 void cache_return_entry_rw LDAP_P(( Cache *cache, Entry *e, int rw ));
 #define cache_return_entry_r(c, e) cache_return_entry_rw((c), (e), 0)
 #define cache_return_entry_w(c, e) cache_return_entry_rw((c), (e), 1)
+void cache_entry_commit LDAP_P(( Entry *e ));
 
 ID cache_find_entry_dn2id LDAP_P(( Backend *be, Cache *cache, const char *dn ));
+ID cache_find_entry_ndn2id LDAP_P(( Backend *be, Cache *cache, const char *ndn ));
 Entry * cache_find_entry_id LDAP_P(( Cache *cache, ID id, int rw ));
 int cache_delete_entry LDAP_P(( Cache *cache, Entry *e ));
 void cache_release_all LDAP_P(( Cache *cache ));
@@ -63,17 +68,19 @@ DBCache * ldbm_cache_open LDAP_P(( Backend *be,
 void ldbm_cache_close LDAP_P(( Backend *be, DBCache *db ));
 void ldbm_cache_really_close LDAP_P(( Backend *be, DBCache *db ));
 void ldbm_cache_flush_all LDAP_P(( Backend *be ));
+void ldbm_cache_sync LDAP_P(( Backend *be ));
 Datum ldbm_cache_fetch LDAP_P(( DBCache *db, Datum key ));
 int ldbm_cache_store LDAP_P(( DBCache *db, Datum key, Datum data, int flags ));
 int ldbm_cache_delete LDAP_P(( DBCache *db, Datum key ));
+void *ldbm_cache_sync_daemon LDAP_P(( void *));
 
 /*
  * dn2id.c
  */
 
 int dn2id_add LDAP_P(( Backend *be, const char *dn, ID id ));
-ID dn2id LDAP_P(( Backend *be, const char *dn ));
-ID_BLOCK *dn2idl LDAP_P(( Backend *be, const char *dn, int prefix ));
+int dn2id LDAP_P(( Backend *be, const char *dn, ID *idp ));
+int dn2idl LDAP_P(( Backend *be, struct berval *dn, int prefix, ID_BLOCK **idlp ));
 int dn2id_delete LDAP_P(( Backend *be, const char *dn, ID id ));
 
 Entry * dn2entry_rw LDAP_P(( Backend *be, const char *dn, Entry **matched, int rw ));
@@ -83,7 +90,9 @@ Entry * dn2entry_rw LDAP_P(( Backend *be, const char *dn, Entry **matched, int r
 /*
  * entry.c
  */
-int ldbm_back_entry_release_rw LDAP_P(( Backend *be, Entry *e, int rw ));
+int ldbm_back_entry_release_rw LDAP_P(( Backend *be,
+       Connection *conn, Operation *op,
+       Entry *e, int rw ));
 
 /*
  * filterindex.c
@@ -130,14 +139,44 @@ ID idl_nextid LDAP_P(( ID_BLOCK *idl, ID *cursor ));
 /*
  * index.c
  */
+extern int
+index_param LDAP_P((
+       Backend *be,
+       AttributeDescription *desc,
+       int ftype,
+       char **dbname,
+       slap_mask_t *mask,
+       struct berval *prefix ));
+
+extern int
+index_values LDAP_P((
+       Backend *be,
+       AttributeDescription *desc,
+       struct berval **vals,
+       ID id,
+       int op ));
 
-int index_add_entry LDAP_P(( Backend *be, Entry *e ));
-ID_BLOCK * index_read LDAP_P(( Backend *be,
-       char *type, int indextype, char *val ));
-/* Possible operations supported (op) by index_change_values() */
-int index_change_values LDAP_P(( Backend *be,
-       char *type, struct berval **vals,
-       ID  id, unsigned int op ));
+int index_entry LDAP_P(( Backend *be, int r, Entry *e, Attribute *ap ));
+#define index_entry_add(be,e,ap) index_entry((be),SLAP_INDEX_ADD_OP,(e),(ap))
+#define index_entry_del(be,e,ap) index_entry((be),SLAP_INDEX_DELETE_OP,(e),(ap))
+
+
+/*
+ * key.c
+ */
+extern int
+key_change LDAP_P((
+    Backend            *be,
+    DBCache    *db,
+    struct berval *k,
+    ID                 id,
+    int                        op ));
+extern int
+key_read LDAP_P((
+    Backend    *be,
+       DBCache *db,
+    struct berval *k,
+       ID_BLOCK **idout ));
 
 /*
  * passwd.c
@@ -169,39 +208,15 @@ extern int ldbm_back_exop_passwd LDAP_P(( BackendDB *bd,
 int ldbm_modify_internal LDAP_P((Backend *be,
        Connection *conn, Operation *op,
        const char *dn, Modifications *mods, Entry *e,
-       const char ** ));
-
-#ifdef HAVE_CYRUS_SASL
-/*
- * sasl.c
- */
-int ldbm_sasl_authorize LDAP_P((
-        BackendDB *be,
-        const char *auth_identity,
-        const char *requested_user,
-        const char **user,
-        const char **errstring ));
-int ldbm_sasl_getsecret LDAP_P((
-        Backend *be,
-        const char *mechanism,
-        const char *auth_identity,
-        const char *realm,
-        sasl_secret_t **secret ));
-int ldbm_sasl_putsecret LDAP_P((
-        Backend *be,
-        const char *mechanism,
-        const char *auth_identity,
-        const char *realm,
-        const sasl_secret_t *secret ));
-#endif /* HAVE_CYRUS_SASL */
+       const char **text, char *textbuf, size_t textlen ));
 
 /*
  * nextid.c
  */
 
-ID next_id LDAP_P(( Backend *be ));
-ID next_id_get LDAP_P(( Backend *be ));
-ID next_id_write LDAP_P(( Backend *be, ID id ));
+int next_id LDAP_P(( Backend *be, ID *idp ));
+int next_id_get LDAP_P(( Backend *be, ID *idp ));
+int next_id_write LDAP_P(( Backend *be, ID id ));
 
 LDAP_END_DECL
 #endif