Commit 26caae81 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6243

parent cf7523a9
......@@ -16,6 +16,7 @@ OpenLDAP 2.4.18 Engineering
Fixed slapd tools to properly close database (ITS#6214)
Fixed slapd uninitialized SlapReply components (ITS#6101)
Fixed slapd-meta starttls with targets (ITS#6190)
Fixed slapd-monitor stats with glued subordinates (ITS#6243)
Fixed slapd-ndb startup (ITS#6203)
Fixed slapd-relay various issues (ITS#6133)
Fixed slapd-relay response/cleanup callback mismatch (ITS#6154)
......
......@@ -130,6 +130,7 @@ typedef struct monitor_info_t {
AttributeDescription *mi_ad_monitorIsShadow;
AttributeDescription *mi_ad_monitorUpdateRef;
AttributeDescription *mi_ad_monitorRuntimeConfig;
AttributeDescription *mi_ad_monitorSuperiorDN;
/*
* Generic description attribute
......
......@@ -126,11 +126,6 @@ monitor_subsys_database_init_one(
bi = oi->oi_orig;
}
/* Subordinates are not exposed as their own naming context */
if ( SLAP_GLUE_SUBORDINATE( be ) ) {
return 0;
}
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, rdn,
mi->mi_oc_monitoredObject, mi, NULL, NULL );
......@@ -166,6 +161,20 @@ monitor_subsys_database_init_one(
attr_merge( e_database, slap_schema.si_ad_namingContexts,
be->be_suffix, NULL );
}
if ( SLAP_GLUE_SUBORDINATE( be ) ) {
BackendDB *sup_be = select_backend( &be->be_nsuffix[ 0 ], 1 );
if ( sup_be == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_database_init: "
"unable to get superior for %s\n",
be->be_suffix[ 0 ].bv_val, 0, 0 );
} else {
attr_merge( e, mi->mi_ad_monitorSuperiorDN,
sup_be->be_suffix, sup_be->be_nsuffix );
}
}
}
(void)init_readOnly( mi, e, be->be_restrictops );
......
......@@ -1903,6 +1903,15 @@ monitor_back_initialize(
"SINGLE-VALUE "
"USAGE dSAOperation )", SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorRuntimeConfig) },
{ "( 1.3.6.1.4.1.4203.666.1.55.30 "
"NAME 'monitorSuperiorDN' "
"DESC 'monitor superior DN' "
/* "SUP distinguishedName " */
"EQUALITY distinguishedNameMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
"NO-USER-MODIFICATION "
"USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorSuperiorDN) },
{ NULL, 0, -1 }
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment