Commit d63287e2 authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#9345 fix for cmdline cookie

Previous commit could cause cmdline cookie to be ignored
parent afc970b1
...@@ -1069,15 +1069,17 @@ do_syncrep1( ...@@ -1069,15 +1069,17 @@ do_syncrep1(
} }
} }
/* ITS#6367: recreate the cookie so it has our SID, not our peer's */ if ( !cmdline_cookie_found ) {
ch_free( si->si_syncCookie.octet_str.bv_val ); /* ITS#6367: recreate the cookie so it has our SID, not our peer's */
BER_BVZERO( &si->si_syncCookie.octet_str ); ch_free( si->si_syncCookie.octet_str.bv_val );
/* Look for contextCSN from syncprov overlay. */ BER_BVZERO( &si->si_syncCookie.octet_str );
check_syncprov( op, si ); /* Look for contextCSN from syncprov overlay. */
if ( BER_BVISNULL( &si->si_syncCookie.octet_str )) check_syncprov( op, si );
slap_compose_sync_cookie( NULL, &si->si_syncCookie.octet_str, if ( BER_BVISNULL( &si->si_syncCookie.octet_str ))
si->si_syncCookie.ctxcsn, si->si_syncCookie.rid, slap_compose_sync_cookie( NULL, &si->si_syncCookie.octet_str,
si->si_syncCookie.sid, NULL ); si->si_syncCookie.ctxcsn, si->si_syncCookie.rid,
si->si_syncCookie.sid, NULL );
}
} }
Debug( LDAP_DEBUG_SYNC, "do_syncrep1: %s starting refresh (sending cookie=%s)\n", Debug( LDAP_DEBUG_SYNC, "do_syncrep1: %s starting refresh (sending cookie=%s)\n",
......
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