fix previous commit

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

diff --git a/servers/slapd/back-ldap/proto-ldap.h b/servers/slapd/back-ldap/proto-ldap.h
index 8c85f507f414e1a8d1f44ba4876820f8c6412377..31e15f2535b59d5dd474c0b8176e320b90825427 100644 (file)
--- a/servers/slapd/back-ldap/proto-ldap.h
+++ b/servers/slapd/back-ldap/proto-ldap.h
@@ -32,7 +32,6 @@ extern BI_destroy             ldap_back_destroy;
 extern BI_db_init              ldap_back_db_init;
 extern BI_db_open              ldap_back_db_open;
 extern BI_db_destroy           ldap_back_db_destroy;
-extern BI_db_config            ldap_back_db_config;
 
 extern BI_op_bind              ldap_back_bind;
 extern BI_op_search            ldap_back_search;
@@ -48,14 +47,16 @@ extern BI_connection_destroy        ldap_back_conn_destroy;
 
 extern BI_entry_get_rw         ldap_back_entry_get;
 
-int ldap_back_freeconn( Operation *op, struct ldapconn *lc );
-struct ldapconn *ldap_back_getconn(struct slap_op *op, struct slap_rep *rs, ldap_back_send_t sendok);
-int ldap_back_dobind(struct ldapconn *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok);
-int ldap_back_retry(struct ldapconn *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok);
-int ldap_back_map_result(SlapReply *rs);
-int ldap_back_op_result(struct ldapconn *lc, Operation *op, SlapReply *rs,
-       ber_int_t msgid, ldap_back_send_t sendok);
-int    back_ldap_LTX_init_module(int argc, char *argv[]);
+int ldap_back_freeconn( Operation *op, ldapconn_t *lc, int dolock );
+ldapconn_t *ldap_back_getconn( Operation *op, SlapReply *rs, ldap_back_send_t sendok );
+void ldap_back_release_conn( Operation *op, SlapReply *rs, ldapconn_t *lc );
+int ldap_back_dobind( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok );
+int ldap_back_retry( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_t sendok );
+int ldap_back_map_result( SlapReply *rs );
+int ldap_back_op_result( ldapconn_t *lc, Operation *op, SlapReply *rs,
+       ber_int_t msgid, time_t timeout, ldap_back_send_t sendok );
+
+int ldap_back_init_cf( BackendInfo *bi );
 
 extern int ldap_back_conn_cmp( const void *c1, const void *c2);
 extern int ldap_back_conn_dup( void *c1, void *c2 );
@@ -63,7 +64,7 @@ extern void ldap_back_conn_free( void *c );
 
 extern int
 ldap_back_proxy_authz_ctrl(
-               struct ldapconn *lc,
+               ldapconn_t      *lc,
                Operation       *op,
                SlapReply       *rs,
                LDAPControl     ***pctrls );
@@ -73,7 +74,12 @@ ldap_back_proxy_authz_ctrl_free(
                Operation       *op,
                LDAPControl     ***pctrls );
 
-extern int chain_init( void );
+extern int chain_initialize( void );
+#ifdef LDAP_DEVEL
+extern int distproc_initialize( void );
+#endif
+
+extern LDAP_REBIND_PROC                *ldap_back_rebind_f;
 
 LDAP_END_DECL