Commit 1573d9e1 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

import fix to back-monitor attribute normalization (ITS#3659)

parent 6853e861
......@@ -8,6 +8,7 @@ OpenLDAP 2.2.25 Release
Fixed back-dnssrv referral all but search op crasher bug (ITS#3642)
Fixed back-ldbm shutdown hang (ITS#3648)
Fixed back-meta memory leak (ITS#3669)
Fixed back-monitor attribute normalization bug (ITS#3659)
Removed broken libldap fast synchronous search result processing
Build Environment
Added improved configure logging
......
......@@ -117,7 +117,7 @@ monitor_subsys_backend_init(
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 );
attr_merge_one( e, slap_schema.si_ad_supportedControl, &bv, &bv );
}
}
......
......@@ -100,7 +100,7 @@ monitor_subsys_conn_init(
bv.bv_val = "0";
bv.bv_len = 1;
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......@@ -164,7 +164,7 @@ monitor_subsys_conn_init(
bv.bv_val = "0";
bv.bv_len = 1;
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......@@ -398,13 +398,13 @@ conn_create(
bv.bv_val = buf;
bv.bv_len = strlen( buf );
attr_merge_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitoredInfo, &bv, &bv );
/* connection number */
snprintf( buf, sizeof( buf ), "%ld", c->c_connid );
bv.bv_val = buf;
bv.bv_len = strlen( buf );
attr_merge_one( e, mi->mi_ad_monitorConnectionNumber, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitorConnectionNumber, &bv, &bv );
/* authz DN */
attr_merge_one( e, mi->mi_ad_monitorConnectionAuthzDN,
......@@ -412,11 +412,11 @@ conn_create(
/* local address */
attr_merge_one( e, mi->mi_ad_monitorConnectionLocalAddress,
&c->c_sock_name, NULL );
&c->c_sock_name, &c->c_sock_name );
/* peer address */
attr_merge_one( e, mi->mi_ad_monitorConnectionPeerAddress,
&c->c_peer_name, NULL );
&c->c_peer_name, &c->c_peer_name );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......
......@@ -127,7 +127,7 @@ monitor_subsys_log_init(
}
}
attr_merge( e, mi->mi_ad_description, desc, NULL );
attr_merge_normalize( e, mi->mi_ad_description, desc, NULL );
monitor_cache_release( mi, e );
......
......@@ -77,8 +77,8 @@ monitor_subsys_ops_init(
return( -1 );
}
attr_merge_one( e_op, mi->mi_ad_monitorOpInitiated, &bv_zero, NULL );
attr_merge_one( e_op, mi->mi_ad_monitorOpCompleted, &bv_zero, NULL );
attr_merge_one( e_op, mi->mi_ad_monitorOpInitiated, &bv_zero, &bv_zero );
attr_merge_one( e_op, mi->mi_ad_monitorOpCompleted, &bv_zero, &bv_zero );
e_tmp = NULL;
......
......@@ -97,7 +97,7 @@ monitor_subsys_rww_init(
bv.bv_val = "0";
bv.bv_len = 1;
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......@@ -158,7 +158,7 @@ monitor_subsys_rww_init(
bv.bv_val = "0";
bv.bv_len = 1;
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......
......@@ -97,7 +97,7 @@ monitor_subsys_sent_init(
bv.bv_val = "0";
bv.bv_len = 1;
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......@@ -160,7 +160,7 @@ monitor_subsys_sent_init(
bv.bv_val = "0";
bv.bv_len = 1;
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......@@ -223,7 +223,7 @@ monitor_subsys_sent_init(
bv.bv_val = "0";
bv.bv_len = 1;
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......@@ -286,7 +286,7 @@ monitor_subsys_sent_init(
bv.bv_val = "0";
bv.bv_len = 1;
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
......
Markdown is supported
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