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 #ifdef SLAP_NVALUES
 319                 /* we should have no normalized values as there is no equality rule */
 320                 /* assert( mod->sm_nvalues[0].bv_val == NULL); */
 321 #endif
 322
 323                 if ( a != NULL ) {
 324                         /* do not allow add of additional attribute
 325                                 if no equality rule exists */
 326                         *text = textbuf;
 327                         snprintf( textbuf, textlen,
 328                                 "modify/%s: %s: no equality matching rule",
 329                                 op, mod->sm_desc->ad_cname.bv_val );
 330                         return LDAP_INAPPROPRIATE_MATCHING;
 331                 }
 332
 333                 for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
 334                         /* test asserted values against existing values */
 335                         if( a ) {
 336 #ifdef SLAP_NVALUES
 337                                 /* we should have no normalized values as there
 338                                         is no equality rule */
 339                                 assert( a->a_nvals == NULL);
 340 #endif
 341                                 for( matched = 0, j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
 342                                         if ( bvmatch( &mod->sm_bvalues[i], &a->a_vals[j] ) ) {
 343                                                 if ( permissive ) {
 344                                                         matched++;
 345                                                         continue;
 346                                                 }
 347                                                 /* value exists already */
 348                                                 *text = textbuf;
 349                                                 snprintf( textbuf, textlen,
 350                                                         "modify/%s: %s: value #%i already exists",
 351                                                         op, mod->sm_desc->ad_cname.bv_val, j );
 352                                                 return LDAP_TYPE_OR_VALUE_EXISTS;
 353                                         }
 354                                 }
 355                                 if ( permissive && matched == j ) {
 356                                         /* values already exist; do nothing */
 357                                         return LDAP_SUCCESS;
 358                                 }
 359                         }
 360
 361                         /* test asserted values against themselves */
 362                         for( j = 0; j < i; j++ ) {
 363                                 if ( bvmatch( &mod->sm_bvalues[i],
 364                                         &mod->sm_bvalues[j] ) ) {
 365
 366                                         /* value exists already */
 367                                         *text = textbuf;
 368                                         snprintf( textbuf, textlen,
 369                                                 "modify/%s: %s: value #%i already exists",
 370                                                 op, mod->sm_desc->ad_cname.bv_val, j );
 371                                         return LDAP_TYPE_OR_VALUE_EXISTS;
 372                                 }
 373                         }
 374                 }
 375
 376         } else {
 377 #ifdef SLAP_NVALUES
 378                 /* no normalization is done in this routine nor
 379                  * in the matching routines called by this routine.
 380                  * values are now normalized once on input to the
 381                  * server (whether from LDAP or from the underlying
 382                  * database).
 383                  * This should outperform the old code.  No numbers
 384                  * are available yet.
 385                  */
 386 #else
 387                 /*
 388                  * The original code performs ( n ) normalizations
 389                  * and ( n * ( n - 1 ) / 2 ) matches, which hide
 390                  * the same number of normalizations.  The new code
 391                  * performs the same number of normalizations ( n )
 392                  * and ( n * ( n - 1 ) / 2 ) mem compares, far less
 393                  * expensive than an entire match, if a match is
 394                  * equivalent to a normalization and a mem compare ...
 395                  *
 396                  * This is far more memory expensive than the previous,
 397                  * but it can heavily improve performances when big
 398                  * chunks of data are added (typical example is a group
 399                  * with thousands of DN-syntax members; on my system:
 400                  * for members of 5-RDN DNs,
 401
 402                 members         orig            bvmatch (dirty) new
 403                 1000            0m38.456s       0m0.553s        0m0.608s
 404                 2000            2m33.341s       0m0.851s        0m1.003s
 405
 406                  * Moreover, 100 groups with 10000 members each were
 407                  * added in 37m27.933s (an analogous LDIF file was
 408                  * loaded into Active Directory in 38m28.682s, BTW).
 409                  *
 410                  * Maybe we could switch to the new algorithm when
 411                  * the number of values overcomes a given threshold?
 412                  */
 413 #endif
 414
 415                 int             rc;
 416
 417                 if ( mod->sm_bvalues[1].bv_val == 0 ) {
 418                         if ( a != NULL ) {
 419                                 struct berval   asserted;
 420                                 int             i;
 421
 422 #ifndef SLAP_NVALUES
 423                                 rc = value_normalize( mod->sm_desc, SLAP_MR_EQUALITY,
 424                                         &mod->sm_bvalues[ 0 ], &asserted, text );
 425                                 if ( rc != LDAP_SUCCESS ) {
 426                                         return rc;
 427                                 }
 428 #endif
 429
 430                                 for ( matched = 0, i = 0; a->a_vals[ i ].bv_val; i++ ) {
 431                                         int     match;
 432
 433 #ifdef SLAP_NVALUES
 434                                         if( mod->sm_nvalues ) {
 435                                                 rc = value_match( &match, mod->sm_desc, mr,
 436                                                         SLAP_MR_EQUALITY
 437                                                                 | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX
 438                                                                 | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
 439                                                                 | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
 440                                                         &a->a_nvals[i],
 441                                                         &mod->sm_nvalues[0],
 442                                                         text );
 443
 444                                         } else {
 445                                                 rc = value_match( &match, mod->sm_desc, mr,
 446                                                         SLAP_MR_EQUALITY
 447                                                                 | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
 448                                                         &a->a_vals[i],
 449                                                         &mod->sm_values[0],
 450                                                         text );
 451                                         }
 452
 453 #else
 454                                         rc = value_match( &match, mod->sm_desc, mr,
 455                                                 SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
 456                                                 &a->a_vals[i],
 457                                                 &asserted,
 458                                                 text );
 459 #endif
 460
 461                                         if( rc == LDAP_SUCCESS && match == 0 ) {
 462                                                 if ( permissive ) {
 463                                                         matched++;
 464                                                         continue;
 465                                                 }
 466                                                 free( asserted.bv_val );
 467                                                 *text = textbuf;
 468                                                 snprintf( textbuf, textlen,
 469                                                         "modify/%s: %s: value #0 already exists",
 470                                                         op, mod->sm_desc->ad_cname.bv_val, 0 );
 471                                                 return LDAP_TYPE_OR_VALUE_EXISTS;
 472                                         }
 473                                 }
 474                                 if ( permissive && matched == i ) {
 475                                         /* values already exist; do nothing */
 476                                         return LDAP_SUCCESS;
 477                                 }
 478                         }
 479
 480                 } else {
 481                         rc = modify_check_duplicates( mod->sm_desc, mr,
 482                                         a ? a->a_vals : NULL, mod->sm_bvalues,
 483                                         permissive,
 484                                         text, textbuf, textlen );
 485
 486                         if ( permissive && rc == LDAP_TYPE_OR_VALUE_EXISTS ) {
 487                                 return LDAP_SUCCESS;
 488                         }
 489
 490                         if ( rc != LDAP_SUCCESS ) {
 491                                 return rc;
 492                         }
 493                 }
 494         }
 495
 496         /* no - add them */
 497 #ifdef SLAP_NVALUES
 498         if( attr_merge( e, mod->sm_desc, mod->sm_values, mod->sm_nvalues ) != 0 )
 499 #else
 500         if( attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 )
 501 #endif
 502         {
 503                 /* this should return result of attr_merge */
 504                 *text = textbuf;
 505                 snprintf( textbuf, textlen,
 506                         "modify/%s: %s: merge error",
 507                         op, mod->sm_desc->ad_cname.bv_val );
 508                 return LDAP_OTHER;
 509         }
 510
 511         return LDAP_SUCCESS;
 512 }
 513
 514 int
 515 modify_delete_values(
 516         Entry   *e,
 517         Modification    *mod,
 518         int     permissive,
 519         const char      **text,
 520         char *textbuf, size_t textlen
 521 )
 522 {
 523         int             i, j, k, rc = LDAP_SUCCESS;
 524         Attribute       *a;
 525         MatchingRule    *mr = mod->sm_desc->ad_type->sat_equality;
 526 #ifndef SLAP_NVALUES
 527         BerVarray       nvals = NULL;
 528 #endif
 529         char            dummy = '\0';
 530
 531         /*
 532          * If permissive is set, then the non-existence of an
 533          * attribute is not treated as an error.
 534          */
 535
 536         /* delete the entire attribute */
 537         if ( mod->sm_bvalues == NULL ) {
 538                 rc = attr_delete( &e->e_attrs, mod->sm_desc );
 539
 540                 if( permissive ) {
 541                         rc = LDAP_SUCCESS;
 542                 } else if( rc != LDAP_SUCCESS ) {
 543                         *text = textbuf;
 544                         snprintf( textbuf, textlen,
 545                                 "modify/delete: %s: no such attribute",
 546                                 mod->sm_desc->ad_cname.bv_val );
 547                         rc = LDAP_NO_SUCH_ATTRIBUTE;
 548                 }
 549                 return rc;
 550         }
 551
 552         if( mr == NULL || !mr->smr_match ) {
 553                 /* disallow specific attributes from being deleted if
 554                         no equality rule */
 555                 *text = textbuf;
 556                 snprintf( textbuf, textlen,
 557                         "modify/delete: %s: no equality matching rule",
 558                         mod->sm_desc->ad_cname.bv_val );
 559                 return LDAP_INAPPROPRIATE_MATCHING;
 560         }
 561
 562         /* delete specific values - find the attribute first */
 563         if ( (a = attr_find( e->e_attrs, mod->sm_desc )) == NULL ) {
 564                 if( permissive ) {
 565                         return LDAP_SUCCESS;
 566                 }
 567                 *text = textbuf;
 568                 snprintf( textbuf, textlen,
 569                         "modify/delete: %s: no such attribute",
 570                         mod->sm_desc->ad_cname.bv_val );
 571                 return LDAP_NO_SUCH_ATTRIBUTE;
 572         }
 573
 574 #ifndef SLAP_NVALUES
 575         /* find each value to delete */
 576         for ( j = 0; a->a_vals[ j ].bv_val != NULL; j++ )
 577                 /* count existing values */ ;
 578
 579         nvals = (BerVarray)SLAP_CALLOC( j + 1, sizeof ( struct berval ) );
 580         if( nvals == NULL ) {
 581 #ifdef NEW_LOGGING
 582                 LDAP_LOG( OPERATION, ERR,
 583                         "modify_delete_values: SLAP_CALLOC failed", 0, 0, 0 );
 584 #else
 585                 Debug( LDAP_DEBUG_ANY,
 586                         "modify_delete_values: SLAP_CALLOC failed", 0, 0, 0 );
 587 #endif
 588                                 goto return_results;
 589         }
 590
 591         /* normalize existing values */
 592         for ( j = 0; a->a_vals[ j ].bv_val != NULL; j++ ) {
 593                 rc = value_normalize( a->a_desc, SLAP_MR_EQUALITY,
 594                         &a->a_vals[ j ], &nvals[ j ], text );
 595
 596                 if ( rc != LDAP_SUCCESS ) {
 597                         nvals[ j ].bv_val = NULL;
 598                         goto return_results;
 599                 }
 600         }
 601 #endif
 602
 603         for ( i = 0; mod->sm_values[i].bv_val != NULL; i++ ) {
 604                 int     found = 0;
 605 #ifndef SLAP_NVALUES
 606                 struct  berval asserted;
 607
 608                 /* normalize the value to be deleted */
 609                 rc = value_normalize( mod->sm_desc, SLAP_MR_EQUALITY,
 610                         &mod->sm_bvalues[ i ], &asserted, text );
 611
 612                 if( rc != LDAP_SUCCESS ) {
 613                         goto return_results;
 614                 }
 615
 616                 /* search it */
 617                 for ( j = 0; nvals[ j ].bv_val != NULL; j++ )
 618 #else
 619                 for ( j = 0; a->a_vals[j].bv_val != NULL; j++ )
 620 #endif
 621                 {
 622                         int match;
 623
 624 #ifndef SLAP_NVALUES
 625                         if ( nvals[j].bv_val == &dummy ) {
 626                                 continue;
 627                         }
 628
 629 #endif
 630 #ifdef SLAP_NVALUES
 631                         if( mod->sm_nvalues ) {
 632                                 assert( a->a_nvals );
 633                                 rc = (*mr->smr_match)( &match,
 634                                         SLAP_MR_VALUE_OF_ASSERTION_SYNTAX
 635                                                 | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
 636                                                 | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
 637                                         a->a_desc->ad_type->sat_syntax,
 638                                         mr, &a->a_nvals[j],
 639                                         &mod->sm_nvalues[i] );
 640                         } else {
 641                                 assert( a->a_nvals == NULL );
 642                                 rc = (*mr->smr_match)( &match,
 643                                         SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
 644                                         a->a_desc->ad_type->sat_syntax,
 645                                         mr, &a->a_nvals[j],
 646                                         &mod->sm_values[i] );
 647                         }
 648 #else
 649                         rc = (*mr->smr_match)( &match,
 650                                 SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
 651                                 a->a_desc->ad_type->sat_syntax,
 652                                 mr, &nvals[ j ],
 653                                 &asserted );
 654 #endif
 655
 656                         if ( rc != LDAP_SUCCESS ) {
 657 #ifndef SLAP_NVALUES
 658                                 free( asserted.bv_val );
 659 #endif
 660                                 *text = textbuf;
 661                                 snprintf( textbuf, textlen,
 662                                         "%s: matching rule failed",
 663                                         mod->sm_desc->ad_cname.bv_val );
 664                                 goto return_results;
 665                         }
 666
 667                         if ( match != 0 ) {
 668                                 continue;
 669                         }
 670
 671                         found = 1;
 672
 673                         /* delete value and mark it as dummy */
 674 #ifdef SLAP_NVALUES
 675                         free( a->a_vals[j].bv_val );
 676                         a->a_vals[j].bv_val = &dummy;
 677                         if( a->a_nvals ) {
 678                                 free( a->a_nvals[j].bv_val );
 679                                 a->a_nvals[j].bv_val = &dummy;
 680                         }
 681 #else
 682                         free( nvals[ j ].bv_val );
 683                         nvals[ j ].bv_val = &dummy;
 684 #endif
 685
 686                         break;
 687                 }
 688
 689 #ifndef SLAP_NVALUES
 690                 free( asserted.bv_val );
 691 #endif
 692
 693                 if ( found == 0 ) {
 694                         *text = textbuf;
 695                         snprintf( textbuf, textlen,
 696                                 "modify/delete: %s: no such value",
 697                                 mod->sm_desc->ad_cname.bv_val );
 698                         rc = LDAP_NO_SUCH_ATTRIBUTE;
 699                         goto return_results;
 700                 }
 701         }
 702
 703         /* compact array skipping dummies */
 704 #ifdef SLAP_NVALUES
 705         for ( k = 0, j = 0; a->a_vals[k].bv_val != NULL; k++ )
 706 #else
 707         for ( k = 0, j = 0; nvals[k].bv_val != NULL; j++, k++ )
 708 #endif
 709         {
 710 #ifdef SLAP_NVALUES
 711                 /* skip dummies */
 712                 if( a->a_vals[k].bv_val == &dummy ) {
 713                         assert( a->a_nvals == NULL || a->a_nvals[k].bv_val == &dummy );
 714                         continue;
 715                 }
 716 #else
 717                 /* delete and skip dummies */ ;
 718                 for ( ; nvals[ k ].bv_val == &dummy; k++ ) {
 719                         free( a->a_vals[ k ].bv_val );
 720                 }
 721 #endif
 722                 if ( j != k ) {
 723                         a->a_vals[ j ] = a->a_vals[ k ];
 724 #ifdef SLAP_NVALUES
 725                         if (a->a_nvals) {
 726                                 a->a_nvals[ j ] = a->a_nvals[ k ];
 727                         }
 728 #endif
 729                 }
 730
 731 #ifndef SLAP_NVALUES
 732                 if ( a->a_vals[ k ].bv_val == NULL ) {
 733                         break;
 734                 }
 735 #else
 736                 j++;
 737 #endif
 738         }
 739
 740         a->a_vals[j].bv_val = NULL;
 741 #ifdef SLAP_NVALUES
 742         if (a->a_nvals) a->a_nvals[j].bv_val = NULL;
 743 #else
 744
 745         assert( i == k - j );
 746 #endif
 747
 748         /* if no values remain, delete the entire attribute */
 749         if ( a->a_vals[0].bv_val == NULL ) {
 750                 if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
 751                         *text = textbuf;
 752                         snprintf( textbuf, textlen,
 753                                 "modify/delete: %s: no such attribute",
 754                                 mod->sm_desc->ad_cname.bv_val );
 755                         rc = LDAP_NO_SUCH_ATTRIBUTE;
 756                 }
 757         }
 758
 759 return_results:;
 760 #ifndef SLAP_NVALUES
 761         if ( nvals ) {
 762                 /* delete the remaining normalized values */
 763                 for ( j = 0; nvals[ j ].bv_val != NULL; j++ ) {
 764                         if ( nvals[ j ].bv_val != &dummy ) {
 765                                 ber_memfree( nvals[ j ].bv_val );
 766                         }
 767                 }
 768                 ber_memfree( nvals );
 769         }
 770 #endif
 771
 772         return rc;
 773 }
 774
 775 int
 776 modify_replace_values(
 777         Entry   *e,
 778         Modification    *mod,
 779         int             permissive,
 780         const char      **text,
 781         char *textbuf, size_t textlen
 782 )
 783 {
 784         (void) attr_delete( &e->e_attrs, mod->sm_desc );
 785
 786         if ( mod->sm_bvalues ) {
 787                 return modify_add_values( e, mod, permissive, text, textbuf, textlen );
 788         }
 789
 790         return LDAP_SUCCESS;
 791 }
 792
 793 void
 794 slap_mod_free(
 795         Modification    *mod,
 796         int                             freeit
 797 )
 798 {
 799         if ( mod->sm_values != NULL ) ber_bvarray_free( mod->sm_values );
 800         mod->sm_values = NULL;
 801
 802 #ifdef SLAP_NVALUES
 803         if ( mod->sm_nvalues != NULL ) ber_bvarray_free( mod->sm_nvalues );
 804         mod->sm_nvalues = NULL;
 805 #endif
 806
 807         if( freeit ) free( mod );
 808 }
 809
 810 void
 811 slap_mods_free(
 812     Modifications       *ml
 813 )
 814 {
 815         Modifications *next;
 816
 817         for ( ; ml != NULL; ml = next ) {
 818                 next = ml->sml_next;
 819
 820                 slap_mod_free( &ml->sml_mod, 0 );
 821                 free( ml );
 822         }
 823 }
 824