mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

SLAP_NVALUE more add tweaks

Browse Source
This commit is contained in:
Kurt Zeilenga 2003-02-26 01:57:07 +00:00
parent 2cdbd25a60
commit a5e883a886
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
servers/slapd/add.c
View File

@ -413,7 +413,7 @@ slap_mods2entry(
for( i=0; attr->a_vals[i].bv_val; i++ ) { for( i=0; attr->a_vals[i].bv_val; i++ ) {
/* count them */ /* count them */
} }
for( j=0; mods->sml_bvalues[j].bv_val; j++ ) { for( j=0; mods->sml_nvalues[j].bv_val; j++ ) {
/* count them */ /* count them */
} }
j++; /* NULL */ j++; /* NULL */
@ -423,12 +423,24 @@ slap_mods2entry(
/* should check for duplicates */ /* should check for duplicates */
AC_MEMCPY( &attr->a_vals[i], mods->sml_bvalues, AC_MEMCPY( &attr->a_vals[i], mods->sml_nvalues,
sizeof( struct berval ) * j ); sizeof( struct berval ) * j );
/* trim the mods array */ /* trim the mods array */
ch_free( mods->sml_bvalues ); ch_free( mods->sml_nvalues );
mods->sml_bvalues = NULL; mods->sml_nvalues = NULL;
if( attr->a_nvals ) {
attr->a_nvals = ch_realloc( attr->a_nvals,
sizeof( struct berval ) * (i+j) );
AC_MEMCPY( &attr->a_nvals[i], mods->sml_nvalues,
sizeof( struct berval ) * j );
/* trim the mods array */
ch_free( mods->sml_nvalues );
mods->sml_nvalues = NULL;
}
continue; continue;
#else #else
@ -439,7 +451,7 @@ slap_mods2entry(
#endif #endif
} }
if( mods->sml_bvalues[1].bv_val != NULL ) { if( mods->sml_values[1].bv_val != NULL ) {
/* check for duplicates */ /* check for duplicates */
int i, j; int i, j;
MatchingRule *mr = mods->sml_desc->ad_type->sat_equality; MatchingRule *mr = mods->sml_desc->ad_type->sat_equality;
@ -485,6 +497,7 @@ slap_mods2entry(
/* should check for duplicates */ /* should check for duplicates */
attr->a_vals = mods->sml_values; attr->a_vals = mods->sml_values;
mods->sml_values = NULL; mods->sml_values = NULL;
#ifdef SLAP_NVALUES #ifdef SLAP_NVALUES
attr->a_nvals = mods->sml_nvalues; attr->a_nvals = mods->sml_nvalues;
mods->sml_nvalues = NULL; mods->sml_nvalues = NULL;