Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

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

diff --git a/servers/slapd/back-monitor/proto-back-monitor.h b/servers/slapd/back-monitor/proto-back-monitor.h
index 6b353563bf20402d35c8a4a435fe5ddb0cbebbe8..6be34809ea010b3004b0bf6a3cb1c4b0c89adc3b 100644 (file)
--- a/servers/slapd/back-monitor/proto-back-monitor.h
+++ b/servers/slapd/back-monitor/proto-back-monitor.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2007 The OpenLDAP Foundation.
+ * Copyright 2001-2013 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -77,6 +77,12 @@ extern int
 monitor_cache_destroy LDAP_P((
        monitor_info_t          *mi ));
 
+extern int
+monitor_back_release(
+       Operation *op,
+       Entry *e,
+       int rw );
+
 /*
  * connections
  */
@@ -118,18 +124,19 @@ monitor_entry_test_flags LDAP_P((
        monitor_entry_t         *mp,
        int                     cond ));
 extern monitor_entry_t *
-monitor_entrypriv_create LDAP_P((
+monitor_back_entrypriv_create LDAP_P((
        void ));
-
 extern Entry *
-monitor_entry_stub LDAP_P((
+monitor_back_entry_stub LDAP_P((
        struct berval   *pdn,
        struct berval   *pndn,
        struct berval   *rdn,
        ObjectClass             *oc,
-       monitor_info_t  *mi,
        struct berval   *create,
-       struct berval   *modify));
+       struct berval   *modify ));
+
+#define monitor_entrypriv_create monitor_back_entrypriv_create
+#define monitor_entry_stub monitor_back_entry_stub
 
 /*
  * init
@@ -141,6 +148,9 @@ extern int
 monitor_back_register_subsys LDAP_P((
        monitor_subsys_t        *ms ));
 extern int
+monitor_back_register_subsys_late LDAP_P((
+       monitor_subsys_t        *ms ));
+extern int
 monitor_back_register_backend LDAP_P((
        BackendInfo             *bi ));
 extern int
@@ -152,20 +162,24 @@ monitor_back_register_overlay_info LDAP_P((
        slap_overinst           *on ));
 extern int
 monitor_back_register_overlay LDAP_P((
-       BackendDB               *be ));
+       BackendDB               *be,
+       struct slap_overinst    *on,
+       struct berval           *ndn_out ));
 extern int
 monitor_back_register_backend_limbo LDAP_P((
        BackendInfo             *bi ));
 extern int
 monitor_back_register_database_limbo LDAP_P((
        BackendDB               *be,
-       struct berval   *ndn ));
+       struct berval           *ndn_out ));
 extern int
 monitor_back_register_overlay_info_limbo LDAP_P((
        slap_overinst           *on ));
 extern int
 monitor_back_register_overlay_limbo LDAP_P((
-       BackendDB               *be ));
+       BackendDB               *be,
+       struct slap_overinst    *on,
+       struct berval           *ndn_out ));
 extern monitor_subsys_t *
 monitor_back_get_subsys LDAP_P((
        const char              *name ));