mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix attr_merge() usage

Browse Source
This commit is contained in:
Pierangelo Masarati 2004-08-06 16:38:41 +00:00
parent 9300a9415f
commit 4297cbaed2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/back-monitor/database.c
View File

@ -63,7 +63,7 @@ init_readOnly( struct monitorinfo *mi, Entry *e, slap_mask_t restrictops )
struct berval *tf = ( ( restrictops & SLAP_RESTRICT_OP_MASK ) == SLAP_RESTRICT_OP_WRITES ) ?
(struct berval *)&slap_true_bv : (struct berval *)&slap_false_bv;
return attr_merge_one( e, mi->mi_ad_readOnly, tf, tf );
return attr_merge_one( e, mi->mi_ad_readOnly, tf, NULL );
}
static int
@ -74,7 +74,7 @@ init_restrictedOperation( struct monitorinfo *mi, Entry *e, slap_mask_t restrict
for ( i = 0; restricted_ops[ i ].op.bv_val; i++ ) {
if ( restrictops & restricted_ops[ i ].tag ) {
rc = attr_merge_one( e, mi->mi_ad_restrictedOperation,
&restricted_ops[ i ].op, &restricted_ops[ i ].op );
&restricted_ops[ i ].op, NULL );
if ( rc ) {
return rc;
}
@ -84,7 +84,7 @@ init_restrictedOperation( struct monitorinfo *mi, Entry *e, slap_mask_t restrict
for ( i = 0; restricted_exops[ i ].op.bv_val; i++ ) {
if ( restrictops & restricted_exops[ i ].tag ) {
rc = attr_merge_one( e, mi->mi_ad_restrictedOperation,
&restricted_exops[ i ].op, &restricted_exops[ i ].op );
&restricted_exops[ i ].op, NULL );
if ( rc ) {
return rc;
}
@ -552,7 +552,7 @@ monitor_subsys_database_modify(
if ( !bvmatch( &a->a_vals[0], tf ) ) {
attr_delete( &e->e_attrs, mi->mi_ad_readOnly );
rc = attr_merge_one( e, mi->mi_ad_readOnly, tf, tf );
rc = attr_merge_one( e, mi->mi_ad_readOnly, tf, NULL );
}
if ( rc == LDAP_SUCCESS ) {
@ -623,14 +623,14 @@ monitor_subsys_database_modify(
for ( i = 0; !BER_BVISNULL( &restricted_ops[ i ].op ); i++ ) {
if ( rp_add & restricted_ops[ i ].tag ) {
attr_merge_one( e, mi->mi_ad_restrictedOperation,
&restricted_ops[ i ].op, &restricted_ops[ i ].op );
&restricted_ops[ i ].op, NULL );
}
}
for ( i = 0; !BER_BVISNULL( &restricted_exops[ i ].op ); i++ ) {
if ( rp_add & restricted_exops[ i ].tag ) {
attr_merge_one( e, mi->mi_ad_restrictedOperation,
&restricted_exops[ i ].op, &restricted_exops[ i ].op );
&restricted_exops[ i ].op, NULL );
}
}
}