Diff for /servers/slapd/back-bdb/modrdn.c between versions 1.198 and 1.199

version 1.198, 2008/02/07 11:06:24 version 1.199, 2008/05/01 10:49:35
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.197 2008/01/11 03:01:37 hyc Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/modrdn.c,v 1.198 2008/02/07 11:06:24 ralf Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 2000-2008 The OpenLDAP Foundation.   * Copyright 2000-2008 The OpenLDAP Foundation.
Line 134  retry: /* transaction retry */ Line 134  retry: /* transaction retry */
   
                 rs->sr_err = TXN_ABORT( ltid );                  rs->sr_err = TXN_ABORT( ltid );
                 ltid = NULL;                  ltid = NULL;
                 op->o_private = NULL;                  LDAP_SLIST_REMOVE( &op->o_extra, &opinfo.boi_oe, OpExtra, oe_next );
                   opinfo.boi_oe.oe_key = NULL;
                 op->o_do_not_cache = opinfo.boi_acl_cache;                  op->o_do_not_cache = opinfo.boi_acl_cache;
                 if( rs->sr_err != 0 ) {                  if( rs->sr_err != 0 ) {
                         rs->sr_err = LDAP_OTHER;                          rs->sr_err = LDAP_OTHER;
Line 165  retry: /* transaction retry */ Line 166  retry: /* transaction retry */
   
         locker = TXN_ID ( ltid );          locker = TXN_ID ( ltid );
   
         opinfo.boi_bdb = op->o_bd;          opinfo.boi_oe.oe_key = op->o_bd->bd_self;
         opinfo.boi_txn = ltid;          opinfo.boi_txn = ltid;
         opinfo.boi_err = 0;          opinfo.boi_err = 0;
         opinfo.boi_acl_cache = op->o_do_not_cache;          opinfo.boi_acl_cache = op->o_do_not_cache;
         op->o_private = &opinfo;          LDAP_SLIST_INSERT_HEAD( &op->o_extra, &opinfo.boi_oe, oe_next );
   
         /* get entry */          /* get entry */
         rs->sr_err = bdb_dn2entry( op, ltid, &op->o_req_ndn, &ei, 1,          rs->sr_err = bdb_dn2entry( op, ltid, &op->o_req_ndn, &ei, 1,
Line 764  retry: /* transaction retry */ Line 765  retry: /* transaction retry */
         }          }
     
         ltid = NULL;          ltid = NULL;
         op->o_private = NULL;          LDAP_SLIST_REMOVE( &op->o_extra, &opinfo.boi_oe, OpExtra, oe_next );
           opinfo.boi_oe.oe_key = NULL;
     
         if( rs->sr_err != LDAP_SUCCESS ) {          if( rs->sr_err != LDAP_SUCCESS ) {
                 Debug( LDAP_DEBUG_TRACE,                  Debug( LDAP_DEBUG_TRACE,
Line 823  done: Line 825  done:
         if( ltid != NULL ) {          if( ltid != NULL ) {
                 TXN_ABORT( ltid );                  TXN_ABORT( ltid );
         }          }
         op->o_private = NULL;          if ( opinfo.boi_oe.oe_key ) {
                   LDAP_SLIST_REMOVE( &op->o_extra, &opinfo.boi_oe, OpExtra, oe_next );
           }
   
         if( preread_ctrl != NULL && (*preread_ctrl) != NULL ) {          if( preread_ctrl != NULL && (*preread_ctrl) != NULL ) {
                 slap_sl_free( (*preread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );                  slap_sl_free( (*preread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );

Removed from v.1.198  
changed lines
  Added in v.1.199


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