publish updateref...

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

diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index b9e608435807ae3a4d5a91e72e354e51999cbb6f..976b68a5eb103a9481bbba5867e638673f248893 100644 (file)
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.c
@@ -108,9 +108,7 @@ monitor_subsys_backend_init(
                        return( -1 );
                }
                
-               bv.bv_val = bi->bi_type;
-               bv.bv_len = strlen( bv.bv_val );
-
+               ber_str2bv( bi->bi_type, 0, 0, &bv );
                attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo,
                                &bv, NULL );
                attr_merge_normalize_one( e_backend, mi->mi_ad_monitoredInfo,
@@ -120,9 +118,9 @@ monitor_subsys_backend_init(
                        int j;
 
                        for ( j = 0; bi->bi_controls[ j ]; j++ ) {
-                               bv.bv_val = bi->bi_controls[ j ];
-                               bv.bv_len = strlen( bv.bv_val );
-                               attr_merge_one( e, slap_schema.si_ad_supportedControl, &bv, NULL );
+                               ber_str2bv( bi->bi_controls[ j ], 0, 0, &bv );
+                               attr_merge_one( e, slap_schema.si_ad_supportedControl,
+                                               &bv, &bv );
                        }
                }
 
@@ -139,10 +137,9 @@ monitor_subsys_backend_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 );
 
-                       attr_merge_normalize_one( e, mi->mi_ad_seeAlso,
+                       ber_str2bv( buf, 0, 0, &dn );
+                       attr_merge_normalize_one( e, slap_schema.si_ad_seeAlso,
                                        &dn, NULL );
                }