Commit deeafb04 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6367

parent 8d916839
...@@ -19,6 +19,7 @@ OpenLDAP 2.4.20 Engineering ...@@ -19,6 +19,7 @@ OpenLDAP 2.4.20 Engineering
Fixed slapd invalid dn log message (ITS#6309) Fixed slapd invalid dn log message (ITS#6309)
Fixed slapd lockup on shutdown (ITS#6372) Fixed slapd lockup on shutdown (ITS#6372)
Fixed slapd sl_free to better reclaim memory (ITS#6380) Fixed slapd sl_free to better reclaim memory (ITS#6380)
Fixed slapd syncrepl to use correct SID (ITS#6367)
Fixed slapd termination for one level DNs (ITS#6338) Fixed slapd termination for one level DNs (ITS#6338)
Fixed slapd tls_accept to retry in certain cases (ITS#6304) Fixed slapd tls_accept to retry in certain cases (ITS#6304)
Fixed slapd unused parameter (ITS#6356) Fixed slapd unused parameter (ITS#6356)
......
...@@ -665,6 +665,11 @@ do_syncrep1( ...@@ -665,6 +665,11 @@ do_syncrep1(
si->si_syncCookie.ctxcsn, si->si_syncCookie.rid, si->si_syncCookie.ctxcsn, si->si_syncCookie.rid,
si->si_syncCookie.sid ); si->si_syncCookie.sid );
} else { } else {
/* ITS#6367: recreate the cookie so it has our SID, not our peer's */
ch_free( si->si_syncCookie.octet_str.bv_val );
slap_compose_sync_cookie( NULL, &si->si_syncCookie.octet_str,
si->si_syncCookie.ctxcsn, si->si_syncCookie.rid,
si->si_syncCookie.sid );
/* Look for contextCSN from syncprov overlay. */ /* Look for contextCSN from syncprov overlay. */
check_syncprov( op, si ); check_syncprov( op, si );
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment