Diff for /servers/slapd/back-bdb/modrdn.c between versions 1.109 and 1.110

version 1.109, 2003/05/23 23:54:03 version 1.110, 2003/05/24 22:53:08
Line 1 Line 1
 /* modrdn.c - bdb backend modrdn routine */  /* modrdn.c - bdb backend modrdn routine */
 /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/modrdn.c,v 1.108 2003/05/02 11:08:47 hallvard Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/modrdn.c,v 1.109 2003/05/23 23:54:03 hyc Exp $ */
 /*  /*
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 137  retry: /* transaction retry */ Line 137  retry: /* transaction retry */
         op->o_private = &opinfo;          op->o_private = &opinfo;
   
         /* get entry */          /* get entry */
         rs->sr_err = bdb_dn2entry( op->o_bd, ltid, &op->o_req_ndn, &ei, 1,          rs->sr_err = bdb_dn2entry( op, ltid, &op->o_req_ndn, &ei, 1,
                 locker, &lock, op->o_tmpmemctx );                  locker, &lock );
   
         switch( rs->sr_err ) {          switch( rs->sr_err ) {
         case 0:          case 0:
Line 273  retry: /* transaction retry */ Line 273  retry: /* transaction retry */
                  * children.                   * children.
                  */                   */
                 eip = ei->bei_parent;                  eip = ei->bei_parent;
                 rs->sr_err = bdb_cache_find_id( op->o_bd, ltid,                  rs->sr_err = bdb_cache_find_id( op, ltid,
                         eip->bei_id, &eip, 0, locker, &plock, op->o_tmpmemctx );                          eip->bei_id, &eip, 0, locker, &plock );
   
                 switch( rs->sr_err ) {                  switch( rs->sr_err ) {
                 case 0:                  case 0:
Line 465  retry: /* transaction retry */ Line 465  retry: /* transaction retry */
                         /* newSuperior == entry being moved?, if so ==> ERROR */                          /* newSuperior == entry being moved?, if so ==> ERROR */
                         /* Get Entry with dn=newSuperior. Does newSuperior exist? */                          /* Get Entry with dn=newSuperior. Does newSuperior exist? */
   
                         rs->sr_err = bdb_dn2entry( op->o_bd, ltid, np_ndn,                          rs->sr_err = bdb_dn2entry( op, ltid, np_ndn,
                                 &neip, 0, locker, &nplock, op->o_tmpmemctx );                                  &neip, 0, locker, &nplock );
   
                         switch( rs->sr_err ) {                          switch( rs->sr_err ) {
                         case 0: np = neip->bei_e;                          case 0: np = neip->bei_e;
Line 669  retry: /* transaction retry */ Line 669  retry: /* transaction retry */
   
         /* Shortcut the search */          /* Shortcut the search */
         nei = neip ? neip : eip;          nei = neip ? neip : eip;
         rs->sr_err = bdb_cache_find_ndn ( op->o_bd, ltid, &new_ndn,          rs->sr_err = bdb_cache_find_ndn ( op, ltid, &new_ndn, &nei, locker );
                 &nei, locker, op->o_tmpmemctx );  
         if ( nei ) bdb_cache_entryinfo_unlock( nei );          if ( nei ) bdb_cache_entryinfo_unlock( nei );
         switch( rs->sr_err ) {          switch( rs->sr_err ) {
         case DB_LOCK_DEADLOCK:          case DB_LOCK_DEADLOCK:
Line 775  retry: /* transaction retry */ Line 774  retry: /* transaction retry */
         e = &dummy;          e = &dummy;
   
         /* delete old one */          /* delete old one */
         rs->sr_err = bdb_dn2id_delete( op->o_bd, lt2, eip, e,          rs->sr_err = bdb_dn2id_delete( op, lt2, eip, e );
                 op->o_tmpmemctx );  
         if ( rs->sr_err != 0 ) {          if ( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
                 LDAP_LOG ( OPERATION, ERR,                   LDAP_LOG ( OPERATION, ERR, 
Line 813  retry: /* transaction retry */ Line 811  retry: /* transaction retry */
         new_ndn.bv_val = NULL;          new_ndn.bv_val = NULL;
   
         /* add new one */          /* add new one */
         rs->sr_err = bdb_dn2id_add( op->o_bd, lt2, neip ? neip : eip, e,          rs->sr_err = bdb_dn2id_add( op, lt2, neip ? neip : eip, e );
                 op->o_tmpmemctx );  
         if ( rs->sr_err != 0 ) {          if ( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
                 LDAP_LOG ( OPERATION, ERR,                   LDAP_LOG ( OPERATION, ERR, 

Removed from v.1.109  
changed lines
  Added in v.1.110


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org