]> git.sur5r.net Git - openldap/commitdiff
ITS#4622 additional fix
authorHoward Chu <hyc@openldap.org>
Wed, 26 Jul 2006 21:36:44 +0000 (21:36 +0000)
committerHoward Chu <hyc@openldap.org>
Wed, 26 Jul 2006 21:36:44 +0000 (21:36 +0000)
servers/slapd/syncrepl.c

index 919d73836c117a41f0f7302dd01fdb74579cbed1..d0c94978cb9060de26ace7318601133a97650796 100644 (file)
@@ -953,15 +953,14 @@ do_syncrep2(
                                                        &syncCookie.ctxcsn, &text );
                                        }
 
-                                       if ( !BER_BVISNULL( &syncCookie.ctxcsn ) &&
-                                               match < 0 )
-                                       {
-                                               rc = syncrepl_updateCookie( si, op, psub, &syncCookie);
-                                       }
+                                       if ( match < 0 ) {
+                                               if ( si->si_refreshPresent == 1 ) {
+                                                       syncrepl_del_nonpresent( op, si, NULL, &syncCookie.ctxcsn );
+                                               }
 
-                                       if ( si->si_refreshPresent == 1 ) {
-                                               if ( match < 0 ) {
-                                                       syncrepl_del_nonpresent( op, si, NULL, NULL );
+                                               if ( !BER_BVISNULL( &syncCookie.ctxcsn ))
+                                               {
+                                                       rc = syncrepl_updateCookie( si, op, psub, &syncCookie);
                                                }
                                        }