Commit 6dead6e8 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

attribute values mucking

parent 373a419f
...@@ -835,6 +835,7 @@ monitor_subsys_database_modify( ...@@ -835,6 +835,7 @@ monitor_subsys_database_modify(
BER_BVZERO( &a->a_vals[ k - 1 ] ); BER_BVZERO( &a->a_vals[ k - 1 ] );
BER_BVZERO( &a->a_nvals[ k - 1 ] ); BER_BVZERO( &a->a_nvals[ k - 1 ] );
a->a_numvals--;
} }
} }
} }
...@@ -860,9 +861,16 @@ monitor_subsys_database_modify( ...@@ -860,9 +861,16 @@ monitor_subsys_database_modify(
BER_BVZERO( &a->a_vals[ k - 1 ] ); BER_BVZERO( &a->a_vals[ k - 1 ] );
BER_BVZERO( &a->a_nvals[ k - 1 ] ); BER_BVZERO( &a->a_nvals[ k - 1 ] );
a->a_numvals--;
} }
} }
} }
if ( a->a_vals == NULL ) {
assert( a->a_numvals == 0 );
attr_delete( &e->e_attrs, mi->mi_ad_restrictedOperation );
}
} }
} }
......
...@@ -395,6 +395,7 @@ delete_values( Operation *op, Entry *e, Modification *mod, int *newlevel ) ...@@ -395,6 +395,7 @@ delete_values( Operation *op, Entry *e, Modification *mod, int *newlevel )
a->a_vals[ k - 1 ] = a->a_vals[ k ]; a->a_vals[ k - 1 ] = a->a_vals[ k ];
} }
BER_BVZERO( &a->a_vals[ k - 1 ] ); BER_BVZERO( &a->a_vals[ k - 1 ] );
a->a_numvals--;
break; break;
} }
...@@ -409,6 +410,8 @@ delete_values( Operation *op, Entry *e, Modification *mod, int *newlevel ) ...@@ -409,6 +410,8 @@ delete_values( Operation *op, Entry *e, Modification *mod, int *newlevel )
/* if no values remain, delete the entire attribute */ /* if no values remain, delete the entire attribute */
if ( BER_BVISNULL( &a->a_vals[ 0 ] ) ) { if ( BER_BVISNULL( &a->a_vals[ 0 ] ) ) {
assert( a->a_numvals == 0 );
/* should already be zero */ /* should already be zero */
*newlevel = 0; *newlevel = 0;
......
Supports Markdown
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