ITS#6707

diff --git a/CHANGES b/CHANGES
index 4be3525e07c4fb0bb635afcbc0fdb3e0355c5fee..27edc2a4ec7b605a9d0018a528af052b48a8501c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed ldapsearch segfault with deref (ITS#6638)
        Fixed slapd acl parsing overflow (ITS#6611)
        Fixed slapd modify to return actual error (ITS#6581)
+       Fixed slapd syncrepl reuse of presence list (ITS#6707)
        Fixed slapd-bdb entry cache delete failure (ITS#6577)
        Fixed slapd-ndb to honor rootpw setting (ITS#6661)
        Fixed slapd-meta anon retry with failed auth method (ITS#6643)

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 1a3e95e25963a8258121874ac9d7da359746a916..d3d5dcf5791eb6f7e7e76d46c9d677ec3de783ad 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1415,6 +1415,11 @@ do_syncrepl(
                si->si_refreshDelete = 0;
                si->si_refreshPresent = 0;
 
+               if ( si->si_presentlist ) {
+                   avl_free( si->si_presentlist, ch_free );
+                   si->si_presentlist = NULL;
+               }
+
                /* use main DB when retrieving contextCSN */
                op->o_bd = si->si_wbe;
                op->o_dn = op->o_bd->be_rootdn;