Sync with HEAD

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

diff --git a/servers/slapd/back-bdb/proto-bdb.h b/servers/slapd/back-bdb/proto-bdb.h
index f9e14ee5604ea8ac435ee4bafeefa42681e57feb..8561e1ca5d9f205b829593057ccd31e22ba6071a 100644 (file)
--- a/servers/slapd/back-bdb/proto-bdb.h
+++ b/servers/slapd/back-bdb/proto-bdb.h
@@ -1,7 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 2000-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _PROTO_BDB_H
@@ -370,13 +379,6 @@ int bdb_modify_internal(
        char *textbuf,
        size_t textlen );
 
-/*
- * passwd.c
- */
-#define bdb_exop_passwd                                BDB_SYMBOL(exop_passwd)
-
-BI_op_extended bdb_exop_passwd;
-
 
 /*
  * cache.c
@@ -548,37 +550,6 @@ int bdb_do_search(
 );
 #define        bdb_psearch(op, rs, sop, e, ps_type)    bdb_do_search(op, rs, sop, e, ps_type)
 
-#define bdb_build_sync_state_ctrl      BDB_SYMBOL(build_sync_state_ctrl)
-#define bdb_build_sync_done_ctrl       BDB_SYMBOL(build_sync_done_ctrl)
-#define bdb_send_ldap_intermediate     BDB_SYMBOL(send_ldap_intermediate)
-
-int
-bdb_build_sync_state_ctrl(
-       Operation       *op,
-       SlapReply               *rs,
-       Entry           *e,
-       int             entry_sync_state,
-       LDAPControl     **ctrls,
-       int             num_ctrls,
-       int             send_cookie,
-       struct berval   *csn     );
-
-int
-bdb_build_sync_done_ctrl(
-       Operation       *op,
-       SlapReply       *rs,
-       LDAPControl     **ctrls,
-       int             num_ctrls,
-       int             send_cookie,
-       struct berval   *latest_entrycsn_bv     );
-
-int
-bdb_send_ldap_intermediate(
-       Operation   *op,
-       SlapReply       *rs,
-       int         state,
-       struct berval *cookie );
-
 /*
  * trans.c
  */