git.sur5r.net Git - openldap/blob - servers/slapd/mods.c

   1 /*
   2  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
   3  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
   4  */
   5 /*
   6  * Copyright (c) 1995 Regents of the University of Michigan.
   7  * All rights reserved.
   8  *
   9  * Redistribution and use in source and binary forms are permitted
  10  * provided that this notice is preserved and that due credit is given
  11  * to the University of Michigan at Ann Arbor. The name of the University
  12  * may not be used to endorse or promote products derived from this
  13  * software without specific prior written permission. This software
  14  * is provided ``as is'' without express or implied warranty.
  15  */
  16
  17 #include "portable.h"
  18
  19 #include "slap.h"
  20
  21 int
  22 modify_check_duplicates(
  23         AttributeDescription    *ad,
  24         MatchingRule            *mr,
  25         BerVarray               vals,
  26         BerVarray               mods,
  27         int                     permissive,
  28         const char      **text,
  29         char *textbuf, size_t textlen )
  30 {
  31         int             i, j, numvals = 0, nummods,
  32                         rc = LDAP_SUCCESS, matched;
  33 #ifdef SLAP_NVALUES
  34         /* needs major reworking */
  35 #else
  36         BerVarray       nvals = NULL, nmods = NULL;
  37
  38         /*
  39          * FIXME: better do the following
  40          *
  41          *   - count the existing values
  42          *   - count the new values
  43          *
  44          *   - if the existing values are less than the new ones {
  45          *       - normalize all the existing values
  46          *       - for each new value {
  47          *           - normalize
  48          *           - check with existing
  49          *           - cross-check with already normalized new vals
  50          *       }
  51          *   } else {
  52          *       - for each new value {
  53          *           - normalize
  54          *           - cross-check with already normalized new vals
  55          *       }
  56          *       - for each existing value {
  57          *           - normalize
  58          *           - check with already normalized new values
  59          *       }
  60          *   }
  61          *
  62          * The first case is good when adding a lot of new values,
  63          * and significantly at first import of values (e.g. adding
  64          * a new group); the latter case seems to be quite important
  65          * as well, because it is likely to be the most frequently
  66          * used when administering the entry.  The current
  67          * implementation will always normalize all the existing
  68          * values before checking.  If there's no duplicate, the
  69          * performances should not change; they will in case of error.
  70          */
  71
  72         for ( nummods = 0; mods[ nummods ].bv_val != NULL; nummods++ )
  73                 /* count new values */ ;
  74
  75         if ( vals ) {
  76                 for ( numvals = 0; vals[ numvals ].bv_val != NULL; numvals++ )
  77                         /* count existing values */ ;
  78
  79                 if ( numvals < nummods ) {
  80                         nvals = SLAP_CALLOC( numvals + 1, sizeof( struct berval ) );
  81                         if( nvals == NULL ) {
  82 #ifdef NEW_LOGGING
  83                                 LDAP_LOG( OPERATION, ERR,
  84                                         "modify_check_duplicates: SLAP_CALLOC failed", 0, 0, 0 );
  85 #else
  86                                 Debug( LDAP_DEBUG_ANY,
  87                                         "modify_check_duplicates: SLAP_CALLOC failed", 0, 0, 0 );
  88 #endif
  89                                 goto return_results;
  90                         }
  91
  92                         /* normalize the existing values first */
  93                         for ( j = 0; vals[ j ].bv_val != NULL; j++ ) {
  94                                 rc = value_normalize( ad, SLAP_MR_EQUALITY,
  95                                         &vals[ j ], &nvals[ j ], text );
  96
  97                                 /* existing attribute values must normalize */
  98                                 assert( rc == LDAP_SUCCESS );
  99
 100                                 if ( rc != LDAP_SUCCESS ) {
 101                                         nvals[ j ].bv_val = NULL;
 102                                         goto return_results;
 103                                 }
 104                         }
 105                         nvals[ j ].bv_val = NULL;
 106                 }
 107         }
 108
 109         /*
 110          * If the existing values are less than the new values,
 111          * it is more convenient to normalize all the existing
 112          * values and test each new value against them first,
 113          * then to other already normalized values
 114          */
 115         nmods = SLAP_CALLOC( nummods + 1, sizeof( struct berval ) );
 116         if ( nmods == NULL ) {
 117 #ifdef NEW_LOGGING
 118                 LDAP_LOG( OPERATION, ERR,
 119                         "modify_check_duplicates: SLAP_CALLOC failed", 0, 0, 0 );
 120 #else
 121                 Debug( LDAP_DEBUG_ANY,
 122                         "modify_check_duplicates: SLAP_CALLOC failed", 0, 0, 0 );
 123 #endif
 124                 goto return_results;
 125         }
 126
 127         for ( i=0; mods[i].bv_val != NULL; i++ ) {
 128                 rc = value_normalize( ad, SLAP_MR_EQUALITY,
 129                         &mods[i], &nmods[i], text );
 130
 131                 if ( rc != LDAP_SUCCESS ) {
 132                         nmods[i].bv_val = NULL;
 133                         goto return_results;
 134                 }
 135
 136                 if ( numvals > 0 && numvals < nummods ) {
 137                         for ( matched=0, j=0; nvals[j].bv_val; j++ ) {
 138                                 int match;
 139
 140                                 rc = (*mr->smr_match)( &match,
 141                                         SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
 142                                         ad->ad_type->sat_syntax,
 143                                         mr, &nmods[ i ], &nvals[ j ] );
 144
 145                                 if ( rc != LDAP_SUCCESS ) {
 146                                         nmods[ i + 1 ].bv_val = NULL;
 147                                         *text = textbuf;
 148                                         snprintf( textbuf, textlen,
 149                                                 "%s: matching rule failed",
 150                                                 ad->ad_cname.bv_val );
 151                                         goto return_results;
 152                                 }
 153
 154                                 if ( match == 0 ) {
 155                                         if ( permissive ) {
 156                                                 matched++;
 157                                                 continue;
 158                                         }
 159                                         *text = textbuf;
 160                                         snprintf( textbuf, textlen,
 161                                                 "%s: value #%d provided more than once",
 162                                                 ad->ad_cname.bv_val, i );
 163                                         rc = LDAP_TYPE_OR_VALUE_EXISTS;
 164                                         nmods[ i + 1 ].bv_val = NULL;
 165                                         goto return_results;
 166                                 }
 167                         }
 168
 169                         if ( permissive && matched == j ) {
 170                                 nmods[ i + 1 ].bv_val = NULL;
 171                                 rc = LDAP_TYPE_OR_VALUE_EXISTS;
 172                                 goto return_results;
 173                         }
 174                 }
 175
 176                 for ( matched = 0, j = 0; j < i; j++ ) {
 177                         int match;
 178
 179                         rc = (*mr->smr_match)( &match,
 180                                 SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
 181                                 ad->ad_type->sat_syntax,
 182                                 mr, &nmods[ i ], &nmods[ j ] );
 183                         if ( rc != LDAP_SUCCESS ) {
 184                                 nmods[ i + 1 ].bv_val = NULL;
 185                                 *text = textbuf;
 186                                 snprintf( textbuf, textlen,
 187                                         "%s: matching rule failed",
 188                                         ad->ad_cname.bv_val );
 189                                 goto return_results;
 190                         }
 191
 192                         if ( match == 0 ) {
 193                                 if ( permissive ) {
 194                                         matched++;
 195                                         continue;
 196                                 }
 197                                 *text = textbuf;
 198                                 snprintf( textbuf, textlen,
 199                                         "%s: value #%d provided more than once",
 200                                         ad->ad_cname.bv_val, j );
 201                                 rc = LDAP_TYPE_OR_VALUE_EXISTS;
 202                                 nmods[ i + 1 ].bv_val = NULL;
 203                                 goto return_results;
 204                         }
 205                 }
 206
 207                 if ( permissive && matched == j ) {
 208                         nmods[ i + 1 ].bv_val = NULL;
 209                         rc = LDAP_TYPE_OR_VALUE_EXISTS;
 210                         goto return_results;
 211                 }
 212         }
 213         nmods[ i ].bv_val = NULL;
 214
 215         /*
 216          * if new values are more than existing values, it is more
 217          * convenient to normalize and check all new values first,
 218          * then check each new value against existing values, which
 219          * can be normalized in place
 220          */
 221
 222         if ( numvals >= nummods ) {
 223                 for ( j = 0; vals[ j ].bv_val; j++ ) {
 224                         struct berval   asserted;
 225
 226                         rc = value_normalize( ad, SLAP_MR_EQUALITY,
 227                                 &vals[ j ], &asserted, text );
 228
 229                         if ( rc != LDAP_SUCCESS ) {
 230                                 goto return_results;
 231                         }
 232
 233                         for ( matched = 0, i = 0; nmods[ i ].bv_val; i++ ) {
 234                                 int match;
 235
 236                                 rc = (*mr->smr_match)( &match,
 237                                         SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
 238                                         ad->ad_type->sat_syntax,
 239                                         mr, &nmods[ i ], &asserted );
 240                                 if ( rc != LDAP_SUCCESS ) {
 241                                         *text = textbuf;
 242                                         snprintf( textbuf, textlen,
 243                                                 "%s: matching rule failed",
 244                                                 ad->ad_cname.bv_val );
 245                                         goto return_results;
 246                                 }
 247
 248                                 if ( match == 0 ) {
 249                                         if ( permissive ) {
 250                                                 matched++;
 251                                                 continue;
 252                                         }
 253                                         *text = textbuf;
 254                                         snprintf( textbuf, textlen,
 255                                                 "%s: value #%d provided more than once",
 256                                                 ad->ad_cname.bv_val, j );
 257                                         rc = LDAP_TYPE_OR_VALUE_EXISTS;
 258                                         goto return_results;
 259                                 }
 260                         }
 261
 262                         if ( permissive && matched == i ) {
 263                                 rc = LDAP_TYPE_OR_VALUE_EXISTS;
 264                                 goto return_results;
 265                         }
 266                 }
 267         }
 268
 269 return_results:;
 270         if ( nvals ) {
 271                 ber_bvarray_free( nvals );
 272         }
 273         if ( nmods ) {
 274                 ber_bvarray_free( nmods );
 275         }
 276
 277 #endif
 278         return rc;
 279 }
 280
 281 int
 282 modify_add_values(
 283         Entry   *e,
 284         Modification    *mod,
 285         int     permissive,
 286         const char      **text,
 287         char *textbuf, size_t textlen
 288 )
 289 {
 290         int             i, j;
 291         int             matched;
 292         Attribute       *a;
 293         MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
 294         const char *op;
 295
 296         switch( mod->sm_op ) {
 297         case LDAP_MOD_ADD:
 298                 op = "add";
 299                 break;
 300         case LDAP_MOD_REPLACE:
 301                 op = "replace";
 302                 break;
 303         default:
 304                 op = "?";
 305                 assert( 0 );
 306         }
 307
 308         a = attr_find( e->e_attrs, mod->sm_desc );
 309
 310         /*
 311          * With permissive set, as long as the attribute being added
 312          * has the same value(s?) as the existing attribute, then the
 313          * modify will succeed.
 314          */
 315
 316         /* check if the values we're adding already exist */
 317         if( mr == NULL || !mr->smr_match ) {
 318                 if ( a != NULL ) {
 319                         /* do not allow add of additional attribute
 320                                 if no equality rule exists */
 321                         *text = textbuf;
 322                         snprintf( textbuf, textlen,
 323                                 "modify/%s: %s: no equality matching rule",
 324                                 op, mod->sm_desc->ad_cname.bv_val );
 325                         return LDAP_INAPPROPRIATE_MATCHING;
 326                 }
 327
 328                 for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
 329                         /* test asserted values against existing values */
 330                         if( a ) {
 331                                 for( matched = 0, j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
 332                                         if ( bvmatch( &mod->sm_bvalues[i], &a->a_vals[j] ) ) {
 333                                                 if ( permissive ) {
 334                                                         matched++;
 335                                                         continue;
 336                                                 }
 337                                                 /* value exists already */
 338                                                 *text = textbuf;
 339                                                 snprintf( textbuf, textlen,
 340                                                         "modify/%s: %s: value #%i already exists",
 341                                                         op, mod->sm_desc->ad_cname.bv_val, j );
 342                                                 return LDAP_TYPE_OR_VALUE_EXISTS;
 343                                         }
 344                                 }
 345                                 if ( permissive && matched == j ) {
 346                                         /* values already exist; do nothing */
 347                                         return LDAP_SUCCESS;
 348                                 }
 349                         }
 350
 351                         /* test asserted values against themselves */
 352                         for( j = 0; j < i; j++ ) {
 353                                 if ( bvmatch( &mod->sm_bvalues[i],
 354                                         &mod->sm_bvalues[j] ) ) {
 355
 356                                         /* value exists already */
 357                                         *text = textbuf;
 358                                         snprintf( textbuf, textlen,
 359                                                 "modify/%s: %s: value #%i already exists",
 360                                                 op, mod->sm_desc->ad_cname.bv_val, j );
 361                                         return LDAP_TYPE_OR_VALUE_EXISTS;
 362                                 }
 363                         }
 364                 }
 365
 366         } else {
 367                 /*
 368                  * The original code performs ( n ) normalizations
 369                  * and ( n * ( n - 1 ) / 2 ) matches, which hide
 370                  * the same number of normalizations.  The new code
 371                  * performs the same number of normalizations ( n )
 372                  * and ( n * ( n - 1 ) / 2 ) mem compares, far less
 373                  * expensive than an entire match, if a match is
 374                  * equivalent to a normalization and a mem compare ...
 375                  *
 376                  * This is far more memory expensive than the previous,
 377                  * but it can heavily improve performances when big
 378                  * chunks of data are added (typical example is a group
 379                  * with thousands of DN-syntax members; on my system:
 380                  * for members of 5-RDN DNs,
 381
 382                 members         orig            bvmatch (dirty) new
 383                 1000            0m38.456s       0m0.553s        0m0.608s
 384                 2000            2m33.341s       0m0.851s        0m1.003s
 385
 386                  * Moreover, 100 groups with 10000 members each were
 387                  * added in 37m27.933s (an analogous LDIF file was
 388                  * loaded into Active Directory in 38m28.682s, BTW).
 389                  *
 390                  * Maybe we could switch to the new algorithm when
 391                  * the number of values overcomes a given threshold?
 392                  */
 393
 394                 int             rc;
 395
 396                 if ( mod->sm_bvalues[1].bv_val == 0 ) {
 397                         if ( a != NULL ) {
 398                                 struct berval   asserted;
 399                                 int             i;
 400
 401 #ifndef SLAP_NVALUES
 402                                 rc = value_normalize( mod->sm_desc, SLAP_MR_EQUALITY,
 403                                         &mod->sm_bvalues[ 0 ], &asserted, text );
 404                                 if ( rc != LDAP_SUCCESS ) {
 405                                         return rc;
 406                                 }
 407 #endif
 408
 409                                 for ( matched = 0, i = 0; a->a_vals[ i ].bv_val; i++ ) {
 410                                         int     match;
 411
 412 #ifdef SLAP_NVALUES
 413                                         if( mod->sm_nvalues ) {
 414                                                 rc = value_match( &match, mod->sm_desc, mr,
 415                                                         SLAP_MR_EQUALITY
 416                                                                 | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX
 417                                                                 | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
 418                                                                 | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
 419                                                         &a->a_nvals[i],
 420                                                         &mod->sm_nvalues[0],
 421                                                         text );
 422
 423                                         } else {
 424                                                 rc = value_match( &match, mod->sm_desc, mr,
 425                                                         SLAP_MR_EQUALITY
 426                                                                 | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
 427                                                         &a->a_vals[i],
 428                                                         &mod->sm_values[0],
 429                                                         text );
 430                                         }
 431
 432 #else
 433                                         rc = value_match( &match, mod->sm_desc, mr,
 434                                                 SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
 435                                                 &a->a_vals[i],
 436                                                 &asserted,
 437                                                 text );
 438 #endif
 439
 440                                         if( rc == LDAP_SUCCESS && match == 0 ) {
 441                                                 if ( permissive ) {
 442                                                         matched++;
 443                                                         continue;
 444                                                 }
 445                                                 free( asserted.bv_val );
 446                                                 *text = textbuf;
 447                                                 snprintf( textbuf, textlen,
 448                                                         "modify/%s: %s: value #0 already exists",
 449                                                         op, mod->sm_desc->ad_cname.bv_val, 0 );
 450                                                 return LDAP_TYPE_OR_VALUE_EXISTS;
 451                                         }
 452                                 }
 453                                 if ( permissive && matched == i ) {
 454                                         /* values already exist; do nothing */
 455                                         return LDAP_SUCCESS;
 456                                 }
 457                         }
 458
 459                 } else {
 460                         rc = modify_check_duplicates( mod->sm_desc, mr,
 461                                         a ? a->a_vals : NULL, mod->sm_bvalues,
 462                                         permissive,
 463                                         text, textbuf, textlen );
 464
 465                         if ( permissive && rc == LDAP_TYPE_OR_VALUE_EXISTS ) {
 466                                 return LDAP_SUCCESS;
 467                         }
 468
 469                         if ( rc != LDAP_SUCCESS ) {
 470                                 return rc;
 471                         }
 472                 }
 473         }
 474
 475         /* no - add them */
 476 #ifdef SLAP_NVALUES
 477         if( attr_merge( e, mod->sm_desc, mod->sm_values, mod->sm_nvalues ) != 0 )
 478 #else
 479         if( attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 )
 480 #endif
 481         {
 482                 /* this should return result of attr_merge */
 483                 *text = textbuf;
 484                 snprintf( textbuf, textlen,
 485                         "modify/%s: %s: merge error",
 486                         op, mod->sm_desc->ad_cname.bv_val );
 487                 return LDAP_OTHER;
 488         }
 489
 490         return LDAP_SUCCESS;
 491 }
 492
 493 int
 494 modify_delete_values(
 495         Entry   *e,
 496         Modification    *mod,
 497         int     permissive,
 498         const char      **text,
 499         char *textbuf, size_t textlen
 500 )
 501 {
 502         int             i, j, k, rc = LDAP_SUCCESS;
 503         Attribute       *a;
 504         MatchingRule    *mr = mod->sm_desc->ad_type->sat_equality;
 505         BerVarray       nvals = NULL;
 506         char            dummy = '\0';
 507
 508         /*
 509          * If permissive is set, then the non-existence of an
 510          * attribute is not treated as an error.
 511          */
 512
 513         /* delete the entire attribute */
 514         if ( mod->sm_bvalues == NULL ) {
 515                 rc = attr_delete( &e->e_attrs, mod->sm_desc );
 516
 517                 if( permissive ) {
 518                         rc = LDAP_SUCCESS;
 519                 } else if( rc != LDAP_SUCCESS ) {
 520                         *text = textbuf;
 521                         snprintf( textbuf, textlen,
 522                                 "modify/delete: %s: no such attribute",
 523                                 mod->sm_desc->ad_cname.bv_val );
 524                         rc = LDAP_NO_SUCH_ATTRIBUTE;
 525                 }
 526                 return rc;
 527         }
 528
 529         if( mr == NULL || !mr->smr_match ) {
 530                 /* disallow specific attributes from being deleted if
 531                         no equality rule */
 532                 *text = textbuf;
 533                 snprintf( textbuf, textlen,
 534                         "modify/delete: %s: no equality matching rule",
 535                         mod->sm_desc->ad_cname.bv_val );
 536                 return LDAP_INAPPROPRIATE_MATCHING;
 537         }
 538
 539         /* delete specific values - find the attribute first */
 540         if ( (a = attr_find( e->e_attrs, mod->sm_desc )) == NULL ) {
 541                 if( permissive ) {
 542                         return LDAP_SUCCESS;
 543                 }
 544                 *text = textbuf;
 545                 snprintf( textbuf, textlen,
 546                         "modify/delete: %s: no such attribute",
 547                         mod->sm_desc->ad_cname.bv_val );
 548                 return LDAP_NO_SUCH_ATTRIBUTE;
 549         }
 550
 551 #ifdef SLAP_NVALUES
 552         nvals = a->a_nvals;
 553 #else
 554         /* find each value to delete */
 555         for ( j = 0; a->a_vals[ j ].bv_val != NULL; j++ )
 556                 /* count existing values */ ;
 557
 558         nvals = (BerVarray)SLAP_CALLOC( j + 1, sizeof ( struct berval ) );
 559         if( nvals == NULL ) {
 560 #ifdef NEW_LOGGING
 561                 LDAP_LOG( OPERATION, ERR,
 562                         "modify_delete_values: SLAP_CALLOC failed", 0, 0, 0 );
 563 #else
 564                 Debug( LDAP_DEBUG_ANY,
 565                         "modify_delete_values: SLAP_CALLOC failed", 0, 0, 0 );
 566 #endif
 567                                 goto return_results;
 568         }
 569
 570         /* normalize existing values */
 571         for ( j = 0; a->a_vals[ j ].bv_val != NULL; j++ ) {
 572                 rc = value_normalize( a->a_desc, SLAP_MR_EQUALITY,
 573                         &a->a_vals[ j ], &nvals[ j ], text );
 574
 575                 if ( rc != LDAP_SUCCESS ) {
 576                         nvals[ j ].bv_val = NULL;
 577                         goto return_results;
 578                 }
 579         }
 580 #endif
 581
 582         for ( i = 0; mod->sm_bvalues[ i ].bv_val != NULL; i++ ) {
 583                 int     found = 0;
 584 #ifndef SLAP_NVALUES
 585                 struct  berval asserted;
 586
 587                 /* normalize the value to be deleted */
 588                 rc = value_normalize( mod->sm_desc, SLAP_MR_EQUALITY,
 589                         &mod->sm_bvalues[ i ], &asserted, text );
 590
 591                 if( rc != LDAP_SUCCESS ) {
 592                         goto return_results;
 593                 }
 594 #endif
 595
 596                 /* search it */
 597                 for ( j = 0; nvals[ j ].bv_val != NULL; j++ ) {
 598                         int match;
 599
 600                         if ( nvals[ j ].bv_val == &dummy ) {
 601                                 continue;
 602                         }
 603
 604 #ifdef SLAP_NVALUES
 605                         if( mod->sm_nvalues ) {
 606                                 rc = (*mr->smr_match)( &match,
 607                                         SLAP_MR_VALUE_OF_ASSERTION_SYNTAX
 608                                                 | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
 609                                                 | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
 610                                         a->a_desc->ad_type->sat_syntax,
 611                                         mr, &nvals[ j ],
 612                                         &mod->sm_nvalues[i] );
 613                         } else {
 614                                 rc = (*mr->smr_match)( &match,
 615                                         SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
 616                                         a->a_desc->ad_type->sat_syntax,
 617                                         mr, &nvals[ j ],
 618                                         &mod->sm_values[i] );
 619                         }
 620 #else
 621                         rc = (*mr->smr_match)( &match,
 622                                 SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
 623                                 a->a_desc->ad_type->sat_syntax,
 624                                 mr, &nvals[ j ],
 625                                 &asserted );
 626 #endif
 627
 628                         if ( rc != LDAP_SUCCESS ) {
 629 #ifndef SLAP_NVALUES
 630                                 free( asserted.bv_val );
 631 #endif
 632                                 *text = textbuf;
 633                                 snprintf( textbuf, textlen,
 634                                         "%s: matching rule failed",
 635                                         mod->sm_desc->ad_cname.bv_val );
 636                                 goto return_results;
 637                         }
 638
 639                         if ( match != 0 ) {
 640                                 continue;
 641                         }
 642
 643                         found = 1;
 644
 645                         /* delete value and mark it as dummy */
 646                         free( nvals[ j ].bv_val );
 647                         nvals[ j ].bv_val = &dummy;
 648
 649                         break;
 650                 }
 651
 652 #ifndef SLAP_NVALUES
 653                 free( asserted.bv_val );
 654 #endif
 655
 656                 if ( found == 0 ) {
 657                         *text = textbuf;
 658                         snprintf( textbuf, textlen,
 659                                 "modify/delete: %s: no such value",
 660                                 mod->sm_desc->ad_cname.bv_val );
 661                         rc = LDAP_NO_SUCH_ATTRIBUTE;
 662                         goto return_results;
 663                 }
 664         }
 665
 666         /* compact array skipping dummies */
 667         for ( k = 0, j = 0; nvals[ k ].bv_val != NULL; j++, k++ ) {
 668
 669                 /* delete and skip dummies */ ;
 670                 for ( ; nvals[ k ].bv_val == &dummy; k++ ) {
 671                         free( a->a_vals[ k ].bv_val );
 672                 }
 673
 674                 if ( j != k ) {
 675                         a->a_vals[ j ] = a->a_vals[ k ];
 676 #ifdef SLAP_NVALUES
 677                         if (a->a_nvals) {
 678                                 free( a->a_nvals[j].bv_val );
 679                                 a->a_nvals[ j ] = a->a_nvals[ k ];
 680                         }
 681 #endif
 682                 }
 683
 684                 if ( a->a_vals[ k ].bv_val == NULL ) {
 685                         break;
 686                 }
 687         }
 688         a->a_vals[ j ].bv_val = NULL;
 689 #ifdef SLAP_NVALUES
 690         if (a->a_nvals) a->a_nvals[ j ].bv_val = NULL;
 691 #endif
 692
 693         assert( i == k - j );
 694
 695         /* if no values remain, delete the entire attribute */
 696         if ( a->a_vals[0].bv_val == NULL ) {
 697                 if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
 698                         *text = textbuf;
 699                         snprintf( textbuf, textlen,
 700                                 "modify/delete: %s: no such attribute",
 701                                 mod->sm_desc->ad_cname.bv_val );
 702                         rc = LDAP_NO_SUCH_ATTRIBUTE;
 703                 }
 704         }
 705
 706 return_results:;
 707         if ( nvals ) {
 708                 /* delete the remaining normalized values */
 709                 for ( j = 0; nvals[ j ].bv_val != NULL; j++ ) {
 710                         if ( nvals[ j ].bv_val != &dummy ) {
 711                                 ber_memfree( nvals[ j ].bv_val );
 712                         }
 713                 }
 714                 ber_memfree( nvals );
 715         }
 716
 717         return rc;
 718 }
 719
 720 int
 721 modify_replace_values(
 722         Entry   *e,
 723         Modification    *mod,
 724         int             permissive,
 725         const char      **text,
 726         char *textbuf, size_t textlen
 727 )
 728 {
 729         (void) attr_delete( &e->e_attrs, mod->sm_desc );
 730
 731         if ( mod->sm_bvalues ) {
 732                 return modify_add_values( e, mod, permissive, text, textbuf, textlen );
 733         }
 734
 735         return LDAP_SUCCESS;
 736 }
 737
 738 void
 739 slap_mod_free(
 740         Modification    *mod,
 741         int                             freeit
 742 )
 743 {
 744         if ( mod->sm_values != NULL ) ber_bvarray_free( mod->sm_values );
 745         mod->sm_values = NULL;
 746
 747 #ifdef SLAP_NVALUES
 748         if ( mod->sm_nvalues != NULL ) ber_bvarray_free( mod->sm_nvalues );
 749         mod->sm_nvalues = NULL;
 750 #endif
 751
 752         if( freeit ) free( mod );
 753 }
 754
 755 void
 756 slap_mods_free(
 757     Modifications       *ml
 758 )
 759 {
 760         Modifications *next;
 761
 762         for ( ; ml != NULL; ml = next ) {
 763                 next = ml->sml_next;
 764
 765                 slap_mod_free( &ml->sml_mod, 0 );
 766                 free( ml );
 767         }
 768 }
 769