upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-06 15:10:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix memory context (hope NULL at init is valid)

Browse source
This commit is contained in:
Pierangelo Masarati 2003-04-11 22:30:48 +00:00
parent d46ab4c065
commit 465a50cffc
7 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/slapd/back-monitor/backend.c
View file

@ -109,8 +109,8 @@ monitor_subsys_backend_init(
bv.bv_val = bi->bi_type;
bv.bv_len = strlen( bv.bv_val );
attr_merge_normalize_one( e, monitor_ad_desc, &bv );
attr_merge_normalize_one( e_backend, monitor_ad_desc, &bv );
attr_merge_normalize_one( e, monitor_ad_desc, &bv, NULL );
attr_merge_normalize_one( e_backend, monitor_ad_desc, &bv, NULL );
if ( bi->bi_controls ) {
int j;

3
servers/slapd/back-monitor/compare.c
View file

@ -79,7 +79,8 @@ monitor_back_compare( struct slap_op *op, struct slap_rep *rs)
if ( value_find_ex( op->oq_compare.rs_ava->aa_desc,
SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
a->a_nvals, &op->oq_compare.rs_ava->aa_value ) == 0 )
a->a_nvals, &op->oq_compare.rs_ava->aa_value,
op->o_tmpmemctx ) == 0 )
{
rs->sr_err = LDAP_COMPARE_TRUE;
break;

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

@ -152,7 +152,7 @@ monitor_subsys_database_init(
j, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val );
bv.bv_val = buf;
bv.bv_len = strlen( buf );
attr_merge_normalize_one( e, ad_seeAlso, &bv );
attr_merge_normalize_one( e, ad_seeAlso, &bv, NULL );
break;
}
}
@ -239,7 +239,7 @@ monitor_back_add_plugin( Backend *be, Entry *e_database )
bv.bv_val = buf;
bv.bv_len = strlen( buf );
attr_merge_normalize_one( e_database, monitor_ad_desc, &bv );
attr_merge_normalize_one( e_database, monitor_ad_desc, &bv, NULL );
i++;

4
servers/slapd/back-monitor/listener.c
View file

@ -127,7 +127,7 @@ monitor_subsys_listener_init(
bv.bv_val = "TLS";
bv.bv_len = sizeof("TLS")-1;
attr_merge_normalize_one( e, monitor_ad_desc, &bv );
attr_merge_normalize_one( e, monitor_ad_desc, &bv, NULL );
}
#endif /* HAVE_TLS */
#ifdef LDAP_CONNECTIONLESS
@ -137,7 +137,7 @@ monitor_subsys_listener_init(
bv.bv_val = "UDP";
bv.bv_len = sizeof("UDP")-1;
attr_merge_normalize_one( e, monitor_ad_desc, &bv );
attr_merge_normalize_one( e, monitor_ad_desc, &bv, NULL );
}
#endif /* HAVE_TLS */

16
servers/slapd/back-monitor/log.c
View file

@ -124,7 +124,7 @@ monitor_subsys_log_init(
monitor_ad_desc->ad_type->sat_syntax,
monitor_ad_desc->ad_type->sat_equality,
&int_2_level[ i ].s,
&int_2_level[ i ].n );
&int_2_level[ i ].n, NULL );
if ( rc ) {
return( -1 );
}
@ -348,11 +348,8 @@ add_values( Entry *e, Modification *mod, int *newlevel )
struct berval asserted;
rc = asserted_value_validate_normalize(
mod->sm_desc, mr,
SLAP_MR_EQUALITY,
&mod->sm_bvalues[i],
&asserted,
&text );
mod->sm_desc, mr, SLAP_MR_EQUALITY,
&mod->sm_bvalues[i], &asserted, &text, NULL );
if ( rc != LDAP_SUCCESS ) {
return rc;
@ -430,11 +427,8 @@ delete_values( Entry *e, Modification *mod, int *newlevel )
struct berval asserted;
rc = asserted_value_validate_normalize(
mod->sm_desc, mr,
SLAP_MR_EQUALITY,
&mod->sm_bvalues[i],
&asserted,
&text );
mod->sm_desc, mr, SLAP_MR_EQUALITY,
&mod->sm_bvalues[i], &asserted, &text, NULL );
if( rc != LDAP_SUCCESS ) return rc;

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

@ -120,7 +120,7 @@ monitor_subsys_readw_update_internal(
bv.bv_val = buf;
bv.bv_len = strlen( buf );
attr_merge_normalize_one( e, monitor_ad_desc, &bv );
attr_merge_normalize_one( e, monitor_ad_desc, &bv, NULL );
}
return( 0 );

4
servers/slapd/back-monitor/thread.c
View file

@ -75,7 +75,7 @@ monitor_subsys_thread_init(
bv.bv_val = buf;
bv.bv_len = strlen( bv.bv_val );
attr_merge_normalize_one( e, monitor_ad_desc, &bv );
attr_merge_normalize_one( e, monitor_ad_desc, &bv, NULL );
monitor_cache_release( mi, e );
@ -112,7 +112,7 @@ monitor_subsys_thread_update(
bv.bv_val = buf;
bv.bv_len = strlen( buf );
attr_merge_normalize_one( e, monitor_ad_desc, &bv );
attr_merge_normalize_one( e, monitor_ad_desc, &bv, NULL );
}
return( 0 );