From 3dd04151f54c7d4ed67249342a726618b03dc584 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 21 Nov 2009 02:34:10 +0000 Subject: [PATCH] Always log rid with incoming cookie --- servers/slapd/syncrepl.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index c36ead68e9..869e7cd14f 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -851,8 +851,9 @@ do_syncrep2( if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) { ber_scanf( ber, /*"{"*/ "m}", &cookie ); - Debug( LDAP_DEBUG_SYNC, "do_syncrep2: cookie=%s\n", - BER_BVISNULL( &cookie ) ? "" : cookie.bv_val, 0, 0 ); + Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s cookie=%s\n", + si->si_ridtxt, + BER_BVISNULL( &cookie ) ? "" : cookie.bv_val, 0 ); if ( !BER_BVISNULL( &cookie ) ) { ch_free( syncCookie.octet_str.bv_val ); @@ -999,8 +1000,9 @@ do_syncrep2( if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) { ber_scanf( ber, "m", &cookie ); - Debug( LDAP_DEBUG_SYNC, "do_syncrep2: cookie=%s\n", - BER_BVISNULL( &cookie ) ? "" : cookie.bv_val, 0, 0 ); + Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s cookie=%s\n", + si->si_ridtxt, + BER_BVISNULL( &cookie ) ? "" : cookie.bv_val, 0 ); if ( !BER_BVISNULL( &cookie ) ) { ch_free( syncCookie.octet_str.bv_val ); @@ -1109,8 +1111,9 @@ do_syncrep2( { ber_scanf( ber, "m", &cookie ); - Debug( LDAP_DEBUG_SYNC, "do_syncrep2: cookie=%s\n", - BER_BVISNULL( &cookie ) ? "" : cookie.bv_val, 0, 0 ); + Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s cookie=%s\n", + si->si_ridtxt, + BER_BVISNULL( &cookie ) ? "" : cookie.bv_val, 0 ); if ( !BER_BVISNULL( &cookie ) ) { ch_free( syncCookie.octet_str.bv_val ); @@ -1145,8 +1148,9 @@ do_syncrep2( { ber_scanf( ber, "m", &cookie ); - Debug( LDAP_DEBUG_SYNC, "do_syncrep2: cookie=%s\n", - BER_BVISNULL( &cookie ) ? "" : cookie.bv_val, 0, 0 ); + Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s cookie=%s\n", + si->si_ridtxt, + BER_BVISNULL( &cookie ) ? "" : cookie.bv_val, 0 ); if ( !BER_BVISNULL( &cookie ) ) { ch_free( syncCookie.octet_str.bv_val ); -- 2.39.5