either pass normalized values to attr_merge*() or call attr_merge_normalize*() (fixes...

[openldap] / servers / slapd / back-monitor / overlay.c

diff --git a/servers/slapd/back-monitor/overlay.c b/servers/slapd/back-monitor/overlay.c
index c68d5152cd83321faaa4d24c83ab0b96cc9186ab..01d8beb88e16b01b665798d1ced901a918443f4d 100644 (file)
--- a/servers/slapd/back-monitor/overlay.c
+++ b/servers/slapd/back-monitor/overlay.c
@@ -103,9 +103,7 @@ monitor_subsys_overlay_init(
                        return( -1 );
                }
                
-               bv.bv_val = on->on_bi.bi_type;
-               bv.bv_len = strlen( bv.bv_val );
-
+               ber_str2bv( on->on_bi.bi_type, 0, 0, &bv );
                attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo,
                                &bv, NULL );
                attr_merge_normalize_one( e_overlay, mi->mi_ad_monitoredInfo,
@@ -123,9 +121,8 @@ monitor_subsys_overlay_init(
 
                        snprintf( buf, sizeof( buf ), "cn=Database %d,%s",
                                        j, ms_database->mss_dn.bv_val );
-                       dn.bv_val = buf;
-                       dn.bv_len = strlen( buf );
 
+                       ber_str2bv( buf, 0, 0, &dn );
                        attr_merge_normalize_one( e, mi->mi_ad_seeAlso,
                                        &dn, NULL );
                }