]> git.ipfire.org Git - thirdparty/openldap.git/commitdiff
ITS#9345 syncrepl: call check_syncprov on freshly started consumer
authorHoward Chu <hyc@openldap.org>
Sat, 12 Sep 2020 20:38:20 +0000 (21:38 +0100)
committerHoward Chu <hyc@openldap.org>
Sat, 12 Sep 2020 20:44:31 +0000 (21:44 +0100)
servers/slapd/syncrepl.c

index 781eca70b87bd42cbfb05d5fc16f4e59a1796cda..65ab22fede8d15fa8804740abbdb9c8c14b128bf 100644 (file)
@@ -1067,12 +1067,8 @@ do_syncrep1(
                        }
                        ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
                }
+               }
 
-               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, NULL );
-       } else {
                /* ITS#6367: recreate the cookie so it has our SID, not our peer's */
                ch_free( si->si_syncCookie.octet_str.bv_val );
                BER_BVZERO( &si->si_syncCookie.octet_str );
@@ -1084,8 +1080,6 @@ do_syncrep1(
                                si->si_syncCookie.sid, NULL );
        }
 
-       }
-
        Debug( LDAP_DEBUG_SYNC, "do_syncrep1: %s starting refresh (sending cookie=%s)\n",
                si->si_ridtxt, si->si_syncCookie.octet_str.bv_val );