Diff for /servers/slapd/overlays/syncprov.c between versions 1.104 and 1.105

version 1.104, 2005/09/08 00:19:05 version 1.105, 2005/09/09 02:53:56
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.103 2005/09/02 08:08:44 hyc Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.104 2005/09/08 00:19:05 hyc Exp $ */
 /* syncprov.c - syncrepl provider */  /* syncprov.c - syncrepl provider */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
Line 408  syncprov_findbase( Operation *op, fbase_ Line 408  syncprov_findbase( Operation *op, fbase_
         SlapReply frs = { REP_RESULT };          SlapReply frs = { REP_RESULT };
         int rc;          int rc;
   
         fop = *op;          /* Use basic parameters from syncrepl search, but use
            * current op's threadctx / tmpmemctx
            */
           fop = *fc->fss->s_op;
   
           fop.o_hdr = op->o_hdr;
           fop.o_bd = op->o_bd;
           fop.o_time = op->o_time;
           fop.o_tincr = op->o_tincr;
   
         cb.sc_response = findbase_cb;          cb.sc_response = findbase_cb;
         cb.sc_private = fc;          cb.sc_private = fc;
   
         fop.o_sync_mode &= SLAP_CONTROL_MASK;   /* turn off sync mode */          fop.o_sync_mode = 0;    /* turn off sync mode */
         fop.o_managedsait = SLAP_CONTROL_CRITICAL;          fop.o_managedsait = SLAP_CONTROL_CRITICAL;
         fop.o_callback = &cb;          fop.o_callback = &cb;
         fop.o_tag = LDAP_REQ_SEARCH;          fop.o_tag = LDAP_REQ_SEARCH;
         fop.ors_scope = LDAP_SCOPE_BASE;          fop.ors_scope = LDAP_SCOPE_BASE;
         fop.ors_deref = fc->fss->s_op->ors_deref;  
         fop.ors_limit = NULL;          fop.ors_limit = NULL;
         fop.ors_slimit = 1;          fop.ors_slimit = 1;
         fop.ors_tlimit = SLAP_NO_LIMIT;          fop.ors_tlimit = SLAP_NO_LIMIT;
         fop.ors_attrs = slap_anlist_no_attrs;          fop.ors_attrs = slap_anlist_no_attrs;
         fop.ors_attrsonly = 1;          fop.ors_attrsonly = 1;
         fop.ors_filter = fc->fss->s_op->ors_filter;  
         fop.ors_filterstr = fc->fss->s_op->ors_filterstr;  
   
         fop.o_req_dn = fc->fss->s_op->o_req_dn;  
         fop.o_req_ndn = fc->fss->s_op->o_req_ndn;  
         fop.o_authz = fc->fss->s_op->o_authz;  
   
         fop.o_bd->bd_info = on->on_info->oi_orig;          fop.o_bd->bd_info = on->on_info->oi_orig;
         rc = fop.o_bd->be_search( &fop, &frs );          rc = fop.o_bd->be_search( &fop, &frs );
Line 782  syncprov_sendresp( Operation *op, opcook Line 783  syncprov_sendresp( Operation *op, opcook
         sop.o_bd = op->o_bd;          sop.o_bd = op->o_bd;
         sop.o_controls = op->o_controls;          sop.o_controls = op->o_controls;
         sop.o_private = op->o_private;          sop.o_private = op->o_private;
           sop.o_callback = NULL;
   
         /* If queueing is allowed */          /* If queueing is allowed */
         if ( queue ) {          if ( queue ) {
Line 1696  syncprov_detach_op( Operation *op, synco Line 1698  syncprov_detach_op( Operation *op, synco
                 g2->ga_next = op2->o_groups;                  g2->ga_next = op2->o_groups;
                 op2->o_groups = g2;                  op2->o_groups = g2;
         }          }
           /* Don't allow any further group caching */
           op2->o_do_not_cache = 1;
   
         /* Add op2 to conn so abandon will find us */          /* Add op2 to conn so abandon will find us */
         ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );          ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );

Removed from v.1.104  
changed lines
  Added in v.1.105


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