This is a multi-part message in MIME format.
--------------010303050205060701030601
Content-Type: text/plain; charset=windows-1251; format=flowed
Content-Transfer-Encoding: 7bit
Please review attached patch and merge-in.
Leonid.
---
The attached files is derived from OpenLDAP Software. All of the
modifications
to OpenLDAP Software represented in the following patch(es) were
developed by
Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned
rights
and/or interest in this work to any party. I, Leonid Yuriev am
authorized by
Peter-Service LLC, my employer, to release this work under the following
terms.
Peter-Service LLC hereby places the following modifications to OpenLDAP
Software
(and only these modifications) into the public domain. Hence, these
modifications may be freely used and/or redistributed for any purpose
with or without attribution and/or other notice.
--------------010303050205060701030601
Content-Type: text/x-patch;
name="its8012.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="its8012.patch"
commit decf38f5c4ca7bc90edc2def3e14ba146d786f5b
Author: Leo Yuriev <leo(a)yuriev.ru>
Date: 2014-12-29 13:40:59 +0300
ITS#8012: fix syncops list iteration;
diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 5ef2eaa..eff9e1c 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1166,10 +1166,10 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
syncprov_info_t *si = on->on_bi.bi_private;
fbase_cookie fc;
- syncops *ss, *sprev, *snext;
+ syncops **pss;
Entry *e = NULL;
Attribute *a;
- int rc;
+ int rc, gonext;
struct berval newdn;
int freefdn = 0;
BackendDB *b0 = op->o_bd, db;
@@ -1229,15 +1229,15 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
}
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
- for (ss = si->si_ops, sprev = (syncops *)&si->si_ops; ss;
- sprev = ss, ss=snext)
+ for (pss = &si->si_ops; *pss; pss = gonext ? &(*pss)->s_next : pss)
{
Operation op2;
Opheader oh;
syncmatches *sm;
int found = 0;
+ syncops *ss = *pss;
- snext = ss->s_next;
+ gonext = 1;
if ( ss->s_op->o_abandon )
continue;
@@ -1266,9 +1266,9 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
SlapReply rs = {REP_RESULT};
send_ldap_error( ss->s_op, &rs, LDAP_SYNC_REFRESH_REQUIRED,
"search base has changed" );
- sprev->s_next = snext;
+ *pss = ss->s_next;
+ gonext = 0;
syncprov_drop_psearch( ss, 1 );
- ss = sprev;
continue;
}
@@ -1342,6 +1342,8 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
/* Decrement s_inuse, was incremented when called
* with saveit == TRUE
*/
+ *pss = ss->s_next;
+ gonext = 0;
syncprov_free_syncop( ss );
}
}
--------------010303050205060701030601--
Show replies by thread