From dc7ec5c6dbf464eb75c0860dcd7ea3a4be04c662 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 9 Dec 2004 20:30:48 +0000 Subject: [PATCH] Fix delete/refresh switch --- servers/slapd/syncrepl.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index fe4e41e47b..84df9006aa 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -715,11 +715,6 @@ do_syncrep2( ber_scanf( ber, "tm", &tag, &cookie ); break; case LDAP_TAG_SYNC_REFRESH_DELETE: - Debug( LDAP_DEBUG_SYNC, - "do_syncrep2: %s - %s%s\n", - "LDAP_RES_INTERMEDIATE", - "REFRESH_DELETE\n", "\n" ); - si->si_refreshDelete = 1; case LDAP_TAG_SYNC_REFRESH_PRESENT: Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s - %s%s\n", @@ -727,8 +722,11 @@ do_syncrep2( si_tag == LDAP_TAG_SYNC_REFRESH_PRESENT ? "REFRESH_PRESENT" : "REFRESH_DELETE", "\n" ); - si->si_refreshDelete = 1; - si->si_refreshPresent = 1; + if ( si->si_tag == LDAP_TAG_SYNC_REFRESH_DELETE ) { + si->si_refreshDelete = 1; + } else { + si->si_refreshPresent = 1; + } ber_scanf( ber, "t{" /*"}"*/, &tag ); if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) { -- 2.39.5