Remove fix for ITS#5465, causes ITS#5385 to worsen.

diff --git a/CHANGES b/CHANGES
index 4e9dfcb16c765291477bb54fc293fdda98419d1a..ffec58a7d0f48d5c0c406b74440633036ed7316d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,6 @@ OpenLDAP 2.3.42 Engineering
        Fixed slapd-ldap connection handler (ITS#5404)
        Fixed slapo-accesslog null callback stack crash (ITS#5490)
        Fixed slapo-syncprov csn update with delta-syncrepl (ITS#5493)
-       Fixed slapo-syncprov sending ops without queued CSNs (ITS#5465)
 
 OpenLDAP 2.3.41 Release (2008/02/19)
        Fixed slapd timestamp race condition (ITS#5370)

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 317efc663c7ae659eba04d212860ad9c4f8b7dee..e44b834f5f9787123268ceecb30b9f0165795649 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1515,10 +1515,6 @@ syncprov_op_response( Operation *op, SlapReply *rs )
                                strcpy( si->si_ctxcsnbuf, cbuf );
                                si->si_ctxcsn.bv_len = maxcsn.bv_len;
                        }
-               } else {
-                       /* internal ops that aren't meant to be replicated */
-                       ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
-                       return SLAP_CB_CONTINUE;
                }
 
                /* Don't do any processing for consumer contextCSN updates */