Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / syncrepl.c

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 09de210905503392446f70826ed8a43ac07d87a9..7c07b90873d859fdf57189edc8bb92c9c9dd4448 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -667,7 +667,7 @@ do_syncrep1(
                        LDAP_STAILQ_REMOVE( &slap_sync_cookie, sc, sync_cookie, sc_next );
 
                        /* ctxcsn wasn't parsed yet, do it now */
-                       slap_parse_sync_cookie( sc, op->o_tmpmemctx );
+                       slap_parse_sync_cookie( sc, NULL );
                        slap_sync_cookie_free( &si->si_syncCookie, 0 );
                        slap_dup_sync_cookie( &si->si_syncCookie, sc );
                        slap_sync_cookie_free( sc, 1 );
@@ -1962,6 +1962,7 @@ drop:
                                }
                        }
                        slap_mods_free( newmods, 1 );
+                       rx->rx_mods = oldmods;
                }
        }
        return LDAP_SUCCESS;