]> git.sur5r.net Git - openldap/blob - servers/slapd/back-bdb/modify.c
Cleanup result handling
[openldap] / servers / slapd / back-bdb / modify.c
1 /* modify.c - bdb backend modify routine */
2 /* $OpenLDAP$ */
3 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
4  *
5  * Copyright 2000-2004 The OpenLDAP Foundation.
6  * All rights reserved.
7  *
8  * Redistribution and use in source and binary forms, with or without
9  * modification, are permitted only as authorized by the OpenLDAP
10  * Public License.
11  *
12  * A copy of this license is available in the file LICENSE in the
13  * top-level directory of the distribution or, alternatively, at
14  * <http://www.OpenLDAP.org/license.html>.
15  */
16
17 #include "portable.h"
18
19 #include <stdio.h>
20 #include <ac/string.h>
21 #include <ac/time.h>
22
23 #include "back-bdb.h"
24 #include "external.h"
25
26 static struct berval scbva[] = {
27         BER_BVC("glue"),
28         BER_BVNULL
29 };
30
31 int bdb_modify_internal(
32         Operation *op,
33         DB_TXN *tid,
34         Modifications *modlist,
35         Entry *e,
36         const char **text,
37         char *textbuf,
38         size_t textlen )
39 {
40         int rc, err;
41         Modification    *mod;
42         Modifications   *ml;
43         Attribute       *save_attrs;
44         Attribute       *ap;
45         int                     glue_attr_delete = 0;
46
47 #ifdef NEW_LOGGING
48         LDAP_LOG ( OPERATION, ENTRY, "bdb_modify_internal: 0x%08lx: %s\n", 
49                 e->e_id, e->e_dn, 0 );
50 #else
51         Debug( LDAP_DEBUG_TRACE, "bdb_modify_internal: 0x%08lx: %s\n",
52                 e->e_id, e->e_dn, 0);
53 #endif
54
55         if ( !acl_check_modlist( op, e, modlist )) {
56                 return LDAP_INSUFFICIENT_ACCESS;
57         }
58
59         /* save_attrs will be disposed of by bdb_cache_modify */
60         save_attrs = e->e_attrs;
61         e->e_attrs = attrs_dup( e->e_attrs );
62
63         for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
64                 int match;
65                 mod = &ml->sml_mod;
66                 switch( mod->sm_op ) {
67                 case LDAP_MOD_ADD:
68                 case LDAP_MOD_REPLACE:
69                         if ( mod->sm_desc == slap_schema.si_ad_structuralObjectClass ) {
70                                 value_match( &match, slap_schema.si_ad_structuralObjectClass,
71                                 slap_schema.si_ad_structuralObjectClass->ad_type->sat_equality,
72                                 SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
73                                 &mod->sm_values[0], &scbva[0], text );
74                                 if ( !match )
75                                         glue_attr_delete = 1;
76                         }
77                 }
78                 if ( glue_attr_delete )
79                         break;
80         }
81
82         if ( glue_attr_delete ) {
83                 Attribute       **app = &e->e_attrs;
84                 while ( *app != NULL ) {
85                         if ( !is_at_operational( (*app)->a_desc->ad_type )) {
86                                 Attribute *save = *app;
87                                 *app = (*app)->a_next;
88                                 attr_free( save );
89                                 continue;
90                         }
91                         app = &(*app)->a_next;
92                 }
93         }
94
95         for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
96                 mod = &ml->sml_mod;
97
98                 switch ( mod->sm_op ) {
99                 case LDAP_MOD_ADD:
100 #ifdef NEW_LOGGING
101                         LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify_internal: add\n", 0,0,0);
102 #else
103                         Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: add\n", 0, 0, 0);
104 #endif
105                         err = modify_add_values( e, mod, get_permissiveModify(op),
106                                 text, textbuf, textlen );
107                         if( err != LDAP_SUCCESS ) {
108 #ifdef NEW_LOGGING
109                                 LDAP_LOG ( OPERATION, ERR, 
110                                         "bdb_modify_internal: %d %s\n", err, *text, 0 );
111 #else
112                                 Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
113                                         err, *text, 0);
114 #endif
115                         }
116                         break;
117
118                 case LDAP_MOD_DELETE:
119                         if ( glue_attr_delete )
120                                 break;
121 #ifdef NEW_LOGGING
122                         LDAP_LOG ( OPERATION, DETAIL1, 
123                                 "bdb_modify_internal: delete\n", 0, 0, 0 );
124 #else
125                         Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: delete\n", 0, 0, 0);
126 #endif
127                         err = modify_delete_values( e, mod, get_permissiveModify(op),
128                                 text, textbuf, textlen );
129                         assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
130                         if( err != LDAP_SUCCESS ) {
131 #ifdef NEW_LOGGING
132                                 LDAP_LOG ( OPERATION, ERR, 
133                                         "bdb_modify_internal: %d %s\n", err, *text, 0 );
134 #else
135                                 Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
136                                         err, *text, 0);
137 #endif
138                         }
139                         break;
140
141                 case LDAP_MOD_REPLACE:
142 #ifdef NEW_LOGGING
143                         LDAP_LOG ( OPERATION, DETAIL1, 
144                                 "bdb_modify_internal: replace\n", 0, 0, 0 );
145 #else
146                         Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: replace\n", 0, 0, 0);
147 #endif
148                         err = modify_replace_values( e, mod, get_permissiveModify(op),
149                                 text, textbuf, textlen );
150                         if( err != LDAP_SUCCESS ) {
151 #ifdef NEW_LOGGING
152                                 LDAP_LOG ( OPERATION, ERR, 
153                                         "bdb_modify_internal: %d %s\n", err, *text, 0 );
154 #else
155                                 Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
156                                         err, *text, 0);
157 #endif
158                         }
159                         break;
160
161                 case LDAP_MOD_INCREMENT:
162 #ifdef NEW_LOGGING
163                         LDAP_LOG ( OPERATION, DETAIL1, 
164                                 "bdb_modify_internal: increment\n", 0, 0, 0 );
165 #else
166                         Debug(LDAP_DEBUG_ARGS,
167                                 "bdb_modify_internal: increment\n", 0, 0, 0);
168 #endif
169                         err = modify_increment_values( e, mod, get_permissiveModify(op),
170                                 text, textbuf, textlen );
171                         if( err != LDAP_SUCCESS ) {
172 #ifdef NEW_LOGGING
173                                 LDAP_LOG ( OPERATION, ERR, 
174                                         "bdb_modify_internal: %d %s\n", err, *text, 0 );
175 #else
176                                 Debug(LDAP_DEBUG_ARGS,
177                                         "bdb_modify_internal: %d %s\n",
178                                         err, *text, 0);
179 #endif
180                         }
181                         break;
182
183                 case SLAP_MOD_SOFTADD:
184 #ifdef NEW_LOGGING
185                         LDAP_LOG ( OPERATION, DETAIL1, 
186                                 "bdb_modify_internal: softadd\n",0,0,0 );
187 #else
188                         Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: softadd\n", 0, 0, 0);
189 #endif
190                         /* Avoid problems in index_add_mods()
191                          * We need to add index if necessary.
192                          */
193                         mod->sm_op = LDAP_MOD_ADD;
194
195                         err = modify_add_values( e, mod, get_permissiveModify(op),
196                                 text, textbuf, textlen );
197
198                         mod->sm_op = SLAP_MOD_SOFTADD;
199
200                         if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) {
201                                 err = LDAP_SUCCESS;
202                         }
203
204                         if( err != LDAP_SUCCESS ) {
205 #ifdef NEW_LOGGING
206                                 LDAP_LOG ( OPERATION, ERR, 
207                                         "bdb_modify_internal: %d %s\n", err, *text, 0 );
208 #else
209                                 Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
210                                         err, *text, 0);
211 #endif
212                         }
213                         break;
214
215                 default:
216 #ifdef NEW_LOGGING
217                                 LDAP_LOG ( OPERATION, ERR, 
218                                         "bdb_modify_internal: invalid op %d\n", mod->sm_op, 0, 0 );
219 #else
220                         Debug(LDAP_DEBUG_ANY, "bdb_modify_internal: invalid op %d\n",
221                                 mod->sm_op, 0, 0);
222 #endif
223                         *text = "Invalid modify operation";
224                         err = LDAP_OTHER;
225 #ifdef NEW_LOGGING
226                                 LDAP_LOG ( OPERATION, ERR, 
227                                         "bdb_modify_internal: %d %s\n", err, *text, 0 );
228 #else
229                         Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
230                                 err, *text, 0);
231 #endif
232                 }
233
234                 if ( err != LDAP_SUCCESS ) {
235                         attrs_free( e->e_attrs );
236                         e->e_attrs = save_attrs;
237                         /* unlock entry, delete from cache */
238                         return err; 
239                 }
240
241                 /* If objectClass was modified, reset the flags */
242                 if ( mod->sm_desc == slap_schema.si_ad_objectClass ) {
243                         e->e_ocflags = 0;
244                 }
245
246                 if ( glue_attr_delete ) {
247                         e->e_ocflags = 0;
248                 }
249
250                 /* check if modified attribute was indexed
251                  * but not in case of NOOP... */
252                 err = bdb_index_is_indexed( op->o_bd, mod->sm_desc );
253                 if ( err == LDAP_SUCCESS && !op->o_noop ) {
254                         ap = attr_find( save_attrs, mod->sm_desc );
255                         if ( ap ) ap->a_flags |= SLAP_ATTR_IXDEL;
256
257                         ap = attr_find( e->e_attrs, mod->sm_desc );
258                         if ( ap ) ap->a_flags |= SLAP_ATTR_IXADD;
259                 }
260         }
261
262         /* check that the entry still obeys the schema */
263         rc = entry_schema_check( op->o_bd, e, save_attrs, text, textbuf, textlen );
264         if ( rc != LDAP_SUCCESS || op->o_noop ) {
265                 attrs_free( e->e_attrs );
266                 e->e_attrs = save_attrs;
267
268                 if ( rc != LDAP_SUCCESS ) {
269 #ifdef NEW_LOGGING
270                         LDAP_LOG ( OPERATION, ERR, "bdb_modify_internal: "
271                                 "entry failed schema check %s\n", 
272                                 *text, 0, 0 );
273 #else
274                         Debug( LDAP_DEBUG_ANY,
275                                 "entry failed schema check: %s\n",
276                                 *text, 0, 0 );
277 #endif
278                 }
279
280                 /* if NOOP then silently revert to saved attrs */
281                 return rc;
282         }
283
284         /* update the indices of the modified attributes */
285
286         /* start with deleting the old index entries */
287         for ( ap = save_attrs; ap != NULL; ap = ap->a_next ) {
288                 if ( ap->a_flags & SLAP_ATTR_IXDEL ) {
289                         rc = bdb_index_values( op, tid, ap->a_desc,
290                                 ap->a_nvals,
291                                 e->e_id, SLAP_INDEX_DELETE_OP );
292                         if ( rc != LDAP_SUCCESS ) {
293                                 attrs_free( e->e_attrs );
294                                 e->e_attrs = save_attrs;
295 #ifdef NEW_LOGGING
296                                 LDAP_LOG ( OPERATION, ERR, 
297                                         "bdb_modify_internal: attribute index delete failure\n",
298                                         0, 0, 0 );
299 #else
300                                 Debug( LDAP_DEBUG_ANY,
301                                        "Attribute index delete failure",
302                                        0, 0, 0 );
303 #endif
304                                 return rc;
305                         }
306                         ap->a_flags &= ~SLAP_ATTR_IXDEL;
307                 }
308         }
309
310         /* add the new index entries */
311         for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) {
312                 if (ap->a_flags & SLAP_ATTR_IXADD) {
313                         rc = bdb_index_values( op, tid, ap->a_desc,
314                                 ap->a_nvals,
315                                 e->e_id, SLAP_INDEX_ADD_OP );
316                         if ( rc != LDAP_SUCCESS ) {
317                                 attrs_free( e->e_attrs );
318                                 e->e_attrs = save_attrs;
319 #ifdef NEW_LOGGING
320                                 LDAP_LOG ( OPERATION, ERR, 
321                                         "bdb_modify_internal: attribute index add failure\n", 
322                                         0, 0, 0 );
323 #else
324                                 Debug( LDAP_DEBUG_ANY,
325                                        "Attribute index add failure",
326                                        0, 0, 0 );
327 #endif
328                                 return rc;
329                         }
330                         ap->a_flags &= ~SLAP_ATTR_IXADD;
331                 }
332         }
333
334         return rc;
335 }
336
337
338 int
339 bdb_modify( Operation *op, SlapReply *rs )
340 {
341         struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
342         Entry           *e = NULL;
343         EntryInfo       *ei = NULL;
344         int             manageDSAit = get_manageDSAit( op );
345         char textbuf[SLAP_TEXT_BUFLEN];
346         size_t textlen = sizeof textbuf;
347         DB_TXN  *ltid = NULL, *lt2;
348         struct bdb_op_info opinfo;
349         Entry           dummy;
350
351         u_int32_t       locker = 0;
352         DB_LOCK         lock;
353
354         int             num_retries = 0;
355
356         LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
357         int num_ctrls = 0;
358
359         Operation* ps_list;
360         struct psid_entry *pm_list, *pm_prev;
361         int rc;
362         EntryInfo       *suffix_ei;
363         Entry           *ctxcsn_e;
364         int                     ctxcsn_added = 0;
365
366 #ifdef NEW_LOGGING
367         LDAP_LOG ( OPERATION, ENTRY, "bdb_modify: %s\n", op->o_req_dn.bv_val, 0, 0 );
368 #else
369         Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", op->o_req_dn.bv_val, 0, 0 );
370 #endif
371
372         if( 0 ) {
373 retry:  /* transaction retry */
374                 if( e != NULL ) {
375                         bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
376                         e = NULL;
377                 }
378 #ifdef NEW_LOGGING
379                 LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: retrying...\n", 0, 0, 0 );
380 #else
381                 Debug(LDAP_DEBUG_TRACE,
382                         "bdb_modify: retrying...\n", 0, 0, 0);
383 #endif
384
385                 pm_list = LDAP_LIST_FIRST(&op->o_pm_list);
386                 while ( pm_list != NULL ) {
387                         LDAP_LIST_REMOVE ( pm_list, ps_link );
388                         pm_prev = pm_list;
389                         pm_list = LDAP_LIST_NEXT ( pm_list, ps_link );
390                         ch_free( pm_prev );
391                 }
392
393                 rs->sr_err = TXN_ABORT( ltid );
394                 ltid = NULL;
395                 op->o_private = NULL;
396                 op->o_do_not_cache = opinfo.boi_acl_cache;
397                 if( rs->sr_err != 0 ) {
398                         rs->sr_err = LDAP_OTHER;
399                         rs->sr_text = "internal error";
400                         goto return_results;
401                 }
402                 ldap_pvt_thread_yield();
403                 bdb_trans_backoff( ++num_retries );
404         }
405
406         /* begin transaction */
407         rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
408                 bdb->bi_db_opflags );
409         rs->sr_text = NULL;
410         if( rs->sr_err != 0 ) {
411 #ifdef NEW_LOGGING
412                 LDAP_LOG ( OPERATION, DETAIL1, 
413                         "bdb_modify: txn_begin failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
414 #else
415                 Debug( LDAP_DEBUG_TRACE,
416                         "bdb_modify: txn_begin failed: %s (%d)\n",
417                         db_strerror(rs->sr_err), rs->sr_err, 0 );
418 #endif
419                 rs->sr_err = LDAP_OTHER;
420                 rs->sr_text = "internal error";
421                 goto return_results;
422         }
423
424         locker = TXN_ID ( ltid );
425
426         opinfo.boi_bdb = op->o_bd;
427         opinfo.boi_txn = ltid;
428         opinfo.boi_locker = locker;
429         opinfo.boi_err = 0;
430         opinfo.boi_acl_cache = op->o_do_not_cache;
431         op->o_private = &opinfo;
432
433         /* get entry or ancestor */
434         rs->sr_err = bdb_dn2entry( op, ltid, &op->o_req_ndn, &ei, 1,
435                 locker, &lock );
436
437         if ( rs->sr_err != 0 ) {
438 #ifdef NEW_LOGGING
439                 LDAP_LOG ( OPERATION, DETAIL1, 
440                         "bdb_modify: dn2entry failed: (%d)\n", rs->sr_err, 0, 0 );
441 #else
442                 Debug( LDAP_DEBUG_TRACE,
443                         "bdb_modify: dn2entry failed (%d)\n",
444                         rs->sr_err, 0, 0 );
445 #endif
446                 switch( rs->sr_err ) {
447                 case DB_LOCK_DEADLOCK:
448                 case DB_LOCK_NOTGRANTED:
449                         goto retry;
450                 case DB_NOTFOUND:
451                         break;
452                 case LDAP_BUSY:
453                         rs->sr_text = "ldap server busy";
454                         goto return_results;
455                 default:
456                         rs->sr_err = LDAP_OTHER;
457                         rs->sr_text = "internal error";
458                         goto return_results;
459                 }
460         }
461
462         e = ei->bei_e;
463         /* acquire and lock entry */
464         /* FIXME: dn2entry() should return non-glue entry */
465         if (( rs->sr_err == DB_NOTFOUND ) || ( !manageDSAit && e && is_entry_glue( e ))) {
466                 if ( e != NULL ) {
467                         rs->sr_matched = ch_strdup( e->e_dn );
468                         rs->sr_ref = is_entry_referral( e )
469                                 ? get_entry_referrals( op, e )
470                                 : NULL;
471                         bdb_unlocked_cache_return_entry_r (&bdb->bi_cache, e);
472                         e = NULL;
473
474                 } else {
475                         BerVarray deref = NULL;
476                         if ( !LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
477                                 syncinfo_t *si;
478                                 LDAP_STAILQ_FOREACH( si, &op->o_bd->be_syncinfo, si_next ) {
479                                         struct berval tmpbv;
480                                         ber_dupbv( &tmpbv, &si->si_provideruri_bv[0] );
481                                         ber_bvarray_add( &deref, &tmpbv );
482                 }
483                         } else {
484                                 deref = default_referral;
485                         }
486                         rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
487                                 LDAP_SCOPE_DEFAULT );
488                 }
489
490                 rs->sr_err = LDAP_REFERRAL;
491                 send_ldap_result( op, rs );
492
493                 if ( rs->sr_ref != default_referral ) {
494                         ber_bvarray_free( rs->sr_ref );
495                 }
496                 free( (char *)rs->sr_matched );
497                 rs->sr_ref = NULL;
498                 rs->sr_matched = NULL;
499
500                 goto done;
501         }
502
503         if ( !manageDSAit && is_entry_referral( e ) ) {
504                 /* entry is a referral, don't allow modify */
505                 rs->sr_ref = get_entry_referrals( op, e );
506
507 #ifdef NEW_LOGGING
508                 LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: entry is referral\n", 0, 0, 0 );
509 #else
510                 Debug( LDAP_DEBUG_TRACE,
511                         "bdb_modify: entry is referral\n",
512                         0, 0, 0 );
513 #endif
514
515                 rs->sr_err = LDAP_REFERRAL;
516                 rs->sr_matched = e->e_name.bv_val;
517                 send_ldap_result( op, rs );
518
519                 ber_bvarray_free( rs->sr_ref );
520                 rs->sr_ref = NULL;
521                 rs->sr_matched = NULL;
522                 goto done;
523         }
524
525         if ( get_assert( op ) &&
526                 ( test_filter( op, e, get_assertion( op )) != LDAP_COMPARE_TRUE ))
527         {
528                 rs->sr_err = LDAP_ASSERTION_FAILED;
529                 goto return_results;
530         }
531
532         if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop && !op->o_no_psearch ) {
533                 ldap_pvt_thread_rdwr_rlock( &bdb->bi_pslist_rwlock );
534                 LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
535                         bdb_psearch(op, rs, ps_list, e, LDAP_PSEARCH_BY_PREMODIFY );
536                 }
537                 ldap_pvt_thread_rdwr_runlock( &bdb->bi_pslist_rwlock );
538         }
539
540         if( op->o_preread ) {
541                 if ( slap_read_controls( op, rs, e,
542                         &slap_pre_read_bv, &ctrls[num_ctrls] ) )
543                 {
544 #ifdef NEW_LOGGING
545                         LDAP_LOG ( OPERATION, DETAIL1,
546                                 "<=- bdb_modify: pre-read failed!\n", 0, 0, 0 );
547 #else
548                         Debug( LDAP_DEBUG_TRACE,
549                                 "<=- bdb_modify: pre-read failed!\n", 0, 0, 0 );
550 #endif
551                         goto return_results;
552                 }
553                 ctrls[++num_ctrls] = NULL;
554                 op->o_preread = 0; /* prevent redo on retry */
555         }
556
557         /* nested transaction */
558         rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, ltid, &lt2, 
559                 bdb->bi_db_opflags );
560         rs->sr_text = NULL;
561         if( rs->sr_err != 0 ) {
562 #ifdef NEW_LOGGING
563                 LDAP_LOG ( OPERATION, ERR, 
564                         "bdb_modify: txn_begin(2) failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
565 #else
566                 Debug( LDAP_DEBUG_TRACE,
567                         "bdb_modify: txn_begin(2) failed: %s (%d)\n",
568                         db_strerror(rs->sr_err), rs->sr_err, 0 );
569 #endif
570                 rs->sr_err = LDAP_OTHER;
571                 rs->sr_text = "internal error";
572                 goto return_results;
573         }
574         /* Modify the entry */
575         dummy = *e;
576         rs->sr_err = bdb_modify_internal( op, lt2, op->oq_modify.rs_modlist,
577                 &dummy, &rs->sr_text, textbuf, textlen );
578
579         if( rs->sr_err != LDAP_SUCCESS ) {
580 #ifdef NEW_LOGGING
581                 LDAP_LOG ( OPERATION, ERR, 
582                         "bdb_modify: modify failed (%d)\n", rs->sr_err, 0, 0 );
583 #else
584                 Debug( LDAP_DEBUG_TRACE,
585                         "bdb_modify: modify failed (%d)\n",
586                         rs->sr_err, 0, 0 );
587 #endif
588                 if ( (rs->sr_err == LDAP_INSUFFICIENT_ACCESS) && opinfo.boi_err ) {
589                         rs->sr_err = opinfo.boi_err;
590                 }
591                 switch( rs->sr_err ) {
592                 case DB_LOCK_DEADLOCK:
593                 case DB_LOCK_NOTGRANTED:
594                         goto retry;
595                 }
596                 goto return_results;
597         }
598
599         if( op->o_postread ) {
600                 if( slap_read_controls( op, rs, e,
601                         &slap_post_read_bv, &ctrls[num_ctrls] ) )
602                 {
603 #ifdef NEW_LOGGING
604                         LDAP_LOG ( OPERATION, DETAIL1,
605                                 "<=- bdb_modify: post-read failed!\n", 0, 0, 0 );
606 #else
607                         Debug( LDAP_DEBUG_TRACE,
608                                 "<=- bdb_modify: post-read failed!\n", 0, 0, 0 );
609 #endif
610                         goto return_results;
611                 }
612                 ctrls[++num_ctrls] = NULL;
613                 op->o_postread = 0;  /* prevent redo on retry */
614                 /* FIXME: should read entry on the last retry */
615         }
616
617         /* change the entry itself */
618         rs->sr_err = bdb_id2entry_update( op->o_bd, lt2, &dummy );
619         if ( rs->sr_err != 0 ) {
620 #ifdef NEW_LOGGING
621                 LDAP_LOG ( OPERATION, ERR, 
622                         "bdb_modify: id2entry update failed (%d)\n", rs->sr_err, 0, 0 );
623 #else
624                 Debug( LDAP_DEBUG_TRACE,
625                         "bdb_modify: id2entry update failed (%d)\n",
626                         rs->sr_err, 0, 0 );
627 #endif
628                 switch( rs->sr_err ) {
629                 case DB_LOCK_DEADLOCK:
630                 case DB_LOCK_NOTGRANTED:
631                         goto retry;
632                 }
633                 rs->sr_text = "entry update failed";
634                 goto return_results;
635         }
636
637         if ( TXN_COMMIT( lt2, 0 ) != 0 ) {
638                 rs->sr_err = LDAP_OTHER;
639                 rs->sr_text = "txn_commit(2) failed";
640                 goto return_results;
641         }
642
643         if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
644                 rc = bdb_csn_commit( op, rs, ltid, ei, &suffix_ei,
645                         &ctxcsn_e, &ctxcsn_added, locker );
646                 switch ( rc ) {
647                 case BDB_CSN_ABORT :
648                         goto return_results;
649                 case BDB_CSN_RETRY :
650                         goto retry;
651                 }
652         }
653
654         if( op->o_noop ) {
655                 if ( ( rs->sr_err = TXN_ABORT( ltid ) ) != 0 ) {
656                         rs->sr_text = "txn_abort (no-op) failed";
657                 } else {
658                         rs->sr_err = LDAP_NO_OPERATION;
659                         goto return_results;
660                 }
661         } else {
662                 bdb_cache_modify( e, dummy.e_attrs, bdb->bi_dbenv, locker, &lock );
663
664                 if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
665                         if ( ctxcsn_added ) {
666                                 bdb_cache_add( bdb, suffix_ei, ctxcsn_e,
667                                         (struct berval *)&slap_ldapsync_cn_bv, locker );
668                         }
669                 }
670
671                 if ( rs->sr_err == LDAP_SUCCESS ) {
672                         /* Loop through in-scope entries for each psearch spec */
673                         ldap_pvt_thread_rdwr_rlock( &bdb->bi_pslist_rwlock );
674                         LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
675                                 bdb_psearch( op, rs, ps_list, e, LDAP_PSEARCH_BY_MODIFY );
676                         }
677                         ldap_pvt_thread_rdwr_runlock( &bdb->bi_pslist_rwlock );
678                         pm_list = LDAP_LIST_FIRST(&op->o_pm_list);
679                         while ( pm_list != NULL ) {
680                                 bdb_psearch(op, rs, pm_list->ps_op,
681                                                         e, LDAP_PSEARCH_BY_SCOPEOUT);
682                                 LDAP_LIST_REMOVE ( pm_list, ps_link );
683                                 pm_prev = pm_list;
684                                 pm_list = LDAP_LIST_NEXT ( pm_list, ps_link );
685                                 ch_free( pm_prev );
686                         }
687                 }
688
689                 rs->sr_err = TXN_COMMIT( ltid, 0 );
690         }
691         ltid = NULL;
692         op->o_private = NULL;
693
694         if( rs->sr_err != 0 ) {
695 #ifdef NEW_LOGGING
696                 LDAP_LOG ( OPERATION, ERR, 
697                         "bdb_modify: txn_%s failed %s (%d)\n", 
698                         op->o_noop ? "abort (no_op)" : "commit",
699                         db_strerror(rs->sr_err), rs->sr_err );
700 #else
701                 Debug( LDAP_DEBUG_TRACE,
702                         "bdb_modify: txn_%s failed: %s (%d)\n",
703                         op->o_noop ? "abort (no-op)" : "commit",
704                         db_strerror(rs->sr_err), rs->sr_err );
705 #endif
706                 rs->sr_err = LDAP_OTHER;
707                 rs->sr_text = "commit failed";
708
709                 goto return_results;
710         }
711
712 #ifdef NEW_LOGGING
713         LDAP_LOG ( OPERATION, DETAIL1, 
714                 "bdb_modify: updated%s id=%08lx dn=\"%s\"\n", 
715                 op->o_noop ? " (no_op)" : "", e->e_id, e->e_dn );
716 #else
717         Debug( LDAP_DEBUG_TRACE,
718                 "bdb_modify: updated%s id=%08lx dn=\"%s\"\n",
719                 op->o_noop ? " (no-op)" : "",
720                 e->e_id, e->e_dn );
721 #endif
722
723         rs->sr_err = LDAP_SUCCESS;
724         rs->sr_text = NULL;
725         if( num_ctrls ) rs->sr_ctrls = ctrls;
726
727 return_results:
728         send_ldap_result( op, rs );
729
730         if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) {
731                 ldap_pvt_thread_yield();
732                 TXN_CHECKPOINT( bdb->bi_dbenv,
733                         bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
734         }
735
736 done:
737         if( ltid != NULL ) {
738                 pm_list = LDAP_LIST_FIRST(&op->o_pm_list);
739                 while ( pm_list != NULL ) {
740                         LDAP_LIST_REMOVE ( pm_list, ps_link );
741                         pm_prev = pm_list;
742                         pm_list = LDAP_LIST_NEXT ( pm_list, ps_link );
743                         ch_free( pm_prev );
744                 }
745                 TXN_ABORT( ltid );
746                 op->o_private = NULL;
747         }
748
749         if( e != NULL ) {
750                 bdb_unlocked_cache_return_entry_w (&bdb->bi_cache, e);
751         }
752         return rs->sr_err;
753 }