upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 15:19:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

move entry_stub to monitor_extra_t

Browse source
This commit is contained in:
Pierangelo Masarati 2012-04-09 18:15:31 +02:00
parent 321b0fa93e
commit 11acc75e9f
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/back-ldap/monitor.c
View file

@ -589,7 +589,7 @@ ldap_back_monitor_conn_init(
ms->mss_create = ldap_back_monitor_conn_create; ms->mss_create = ldap_back_monitor_conn_create;
ms->mss_destroy = ldap_back_monitor_subsystem_destroy; ms->mss_destroy = ldap_back_monitor_subsystem_destroy;
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, e = mbe->entry_stub( &ms->mss_dn, &ms->mss_ndn,
&ms->mss_rdn, &ms->mss_rdn,
mi->mi_oc_monitorContainer, mi, NULL, NULL ); mi->mi_oc_monitorContainer, mi, NULL, NULL );
if ( e == NULL ) { if ( e == NULL ) {
@ -749,7 +749,7 @@ ldap_back_monitor_ops_init(
ms->mss_rdn = li->li_monitor_info.lmi_ops_rdn; ms->mss_rdn = li->li_monitor_info.lmi_ops_rdn;
ms->mss_destroy = ldap_back_monitor_subsystem_destroy; ms->mss_destroy = ldap_back_monitor_subsystem_destroy;
parent = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, parent = mbe->entry_stub( &ms->mss_dn, &ms->mss_ndn,
&ms->mss_rdn, &ms->mss_rdn,
mi->mi_oc_monitorContainer, mi, NULL, NULL ); mi->mi_oc_monitorContainer, mi, NULL, NULL );
if ( parent == NULL ) { if ( parent == NULL ) {
@ -779,7 +779,7 @@ ldap_back_monitor_ops_init(
monitor_callback_t *cb; monitor_callback_t *cb;
struct ldap_back_monitor_op_counter *counter; struct ldap_back_monitor_op_counter *counter;
e = monitor_entry_stub( &parent->e_name, &parent->e_nname, e = mbe->entry_stub( &parent->e_name, &parent->e_nname,
&ldap_back_monitor_op[op].rdn, &ldap_back_monitor_op[op].rdn,
mi->mi_oc_monitorCounterObject, mi, NULL, NULL ); mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
if ( e == NULL ) { if ( e == NULL ) {

7
servers/slapd/back-monitor/back-monitor.h
View file

@ -306,6 +306,13 @@ typedef struct monitor_extra_t {
monitor_cbfunc *unregister_entry_parent; monitor_cbfunc *unregister_entry_parent;
monitor_cbafunc *unregister_entry_attrs; monitor_cbafunc *unregister_entry_attrs;
monitor_cbfunc *unregister_entry_callback; monitor_cbfunc *unregister_entry_callback;
Entry * (*entry_stub)( struct berval *pdn,
struct berval *pndn,
struct berval *rdn,
ObjectClass *oc,
monitor_info_t *mi,
struct berval *create,
struct berval *modify );
} monitor_extra_t; } monitor_extra_t;
LDAP_END_DECL LDAP_END_DECL

4
servers/slapd/back-monitor/init.c
View file

@ -64,7 +64,9 @@ static const monitor_extra_t monitor_extra = {
monitor_back_unregister_entry, monitor_back_unregister_entry,
monitor_back_unregister_entry_parent, monitor_back_unregister_entry_parent,
monitor_back_unregister_entry_attrs, monitor_back_unregister_entry_attrs,
monitor_back_unregister_entry_callback monitor_back_unregister_entry_callback,
monitor_back_entry_stub
}; };

6
servers/slapd/back-monitor/proto-back-monitor.h
View file

@ -128,14 +128,16 @@ monitor_entrypriv_create LDAP_P((
void )); void ));
extern Entry * extern Entry *
monitor_entry_stub LDAP_P(( monitor_back_entry_stub LDAP_P((
struct berval *pdn, struct berval *pdn,
struct berval *pndn, struct berval *pndn,
struct berval *rdn, struct berval *rdn,
ObjectClass *oc, ObjectClass *oc,
monitor_info_t *mi, monitor_info_t *mi,
struct berval *create, struct berval *create,
struct berval *modify)); struct berval *modify ));
#define monitor_entry_stub monitor_back_entry_stub
/* /*
* init * init