From 1b36182361bf3514588a554485545a9e2ece2738 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Wed, 18 Apr 2012 11:52:38 -0700
Subject: [PATCH] ITS#7182 new entry points should just be appended to
monitor_extra_t
---
servers/slapd/back-monitor/back-monitor.h | 2 +-
servers/slapd/back-monitor/init.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/servers/slapd/back-monitor/back-monitor.h b/servers/slapd/back-monitor/back-monitor.h
index 6d73e31257..310fef22ad 100644
--- a/servers/slapd/back-monitor/back-monitor.h
+++ b/servers/slapd/back-monitor/back-monitor.h
@@ -290,7 +290,6 @@ typedef struct monitor_extra_t {
monitor_subsys_t * (*get_subsys_by_dn)( struct berval *ndn, int sub );
int (*register_subsys)( monitor_subsys_t *ms );
- int (*register_subsys_late)( monitor_subsys_t *ms );
int (*register_backend)( BackendInfo *bi );
int (*register_database)( BackendDB *be, struct berval *ndn_out );
int (*register_overlay_info)( slap_overinst *on );
@@ -314,6 +313,7 @@ typedef struct monitor_extra_t {
struct berval *create,
struct berval *modify );
monitor_entry_t * (*entrypriv_create)( void );
+ int (*register_subsys_late)( monitor_subsys_t *ms );
} monitor_extra_t;
LDAP_END_DECL
diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index c7350d78e4..2b836820ec 100644
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -52,7 +52,6 @@ static const monitor_extra_t monitor_extra = {
monitor_back_get_subsys_by_dn,
monitor_back_register_subsys,
- monitor_back_register_subsys_late,
monitor_back_register_backend,
monitor_back_register_database,
monitor_back_register_overlay_info,
@@ -68,7 +67,8 @@ static const monitor_extra_t monitor_extra = {
monitor_back_unregister_entry_callback,
monitor_back_entry_stub,
- monitor_back_entrypriv_create
+ monitor_back_entrypriv_create,
+ monitor_back_register_subsys_late
};
--
GitLab