upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

From ITS#5164 - treat monitoredInfo normalization consistently, don't

Browse source 
crash if SLAPI plugin doesn't register a description
This commit is contained in:
Howard Chu 2007-10-03 08:59:37 +00:00
parent bf33d106fa
commit a2a83fe239
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/back-monitor/conn.c
View file

@ -391,7 +391,7 @@ conn_create(
buf2,
buf3 );
attr_merge_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
#endif /* MONITOR_LEGACY_CONN */
bv.bv_len = snprintf( buf, sizeof( buf ), "%lu", c->c_connid );

30
servers/slapd/back-monitor/database.c
View file

@ -151,7 +151,7 @@ monitor_subsys_database_init_one(
}
ber_str2bv( bi->bi_type, 0, 0, &bv );
attr_merge_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitorIsShadow,
SLAP_SHADOW( be ) ? (struct berval *)&slap_true_bv :
(struct berval *)&slap_false_bv, NULL );
@ -295,7 +295,7 @@ monitor_subsys_database_init_one(
return( -1 );
}
ber_str2bv( on->on_bi.bi_type, 0, 0, &bv );
attr_merge_one( e_overlay, mi->mi_ad_monitoredInfo, &bv, NULL );
attr_merge_normalize_one( e_overlay, mi->mi_ad_monitoredInfo, &bv, NULL );
bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Overlay %d,%s",
j, ms_overlay->mss_dn.bv_val );
@ -926,17 +926,21 @@ monitor_back_add_plugin( monitor_info_t *mi, Backend *be, Entry *e_database )
if ( rc != LDAP_SUCCESS ) {
goto done;
}
snprintf( buf, sizeof(buf),
"plugin %d name: %s; "
"vendor: %s; "
"version: %s; "
"description: %s",
i,
srchdesc->spd_id,
srchdesc->spd_vendor,
srchdesc->spd_version,
srchdesc->spd_description );
if ( srchdesc ) {
snprintf( buf, sizeof(buf),
"plugin %d name: %s; "
"vendor: %s; "
"version: %s; "
"description: %s",
i,
srchdesc->spd_id,
srchdesc->spd_vendor,
srchdesc->spd_version,
srchdesc->spd_description );
} else {
snprintf( buf, sizeof(buf),
"plugin %d name: <no description available>", i );
}
ber_str2bv( buf, 0, 0, &bv );
attr_merge_normalize_one( e_database,