From 4eaab344d9cbb53fc7d65413a8ee53d89c48b9ce Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Mon, 18 Mar 2013 12:20:21 +0100
Subject: [PATCH] fix: syncrepl push DELETE operation does not recover

Resolves: #920482
---
 openldap-syncrepl-delete-retry.patch | 24 ++++++++++++++++++++++++
 openldap.spec                        |  7 ++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 openldap-syncrepl-delete-retry.patch

diff --git a/openldap-syncrepl-delete-retry.patch b/openldap-syncrepl-delete-retry.patch
new file mode 100644
index 0000000..b4da70c
--- /dev/null
+++ b/openldap-syncrepl-delete-retry.patch
@@ -0,0 +1,24 @@
+Resolves: #920482
+
+commit 575ad77adba06acfbcb2d44a06240794d00a8b9c
+Author: Howard Chu <hyc@openldap.org>
+Date:   Thu Mar 14 06:39:46 2013 -0700
+
+    ITS#7531 check updateCookie status for INTERMEDIATEs
+    
+    Was already being checked for other message types.
+
+diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
+index d00ba0c..1fba0b7 100644
+--- a/servers/slapd/syncrepl.c
++++ b/servers/slapd/syncrepl.c
+@@ -1344,6 +1344,9 @@ do_syncrep2(
+ 				ldap_memfree( retoid );
+ 				ber_bvfree( retdata );
+ 
++				if ( rc )
++					goto done;
++
+ 			} else {
+ 				Debug( LDAP_DEBUG_ANY, "do_syncrep2: %s "
+ 					"unknown intermediate response (%d)\n",
diff --git a/openldap.spec b/openldap.spec
index 10d173e..2900972 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -9,7 +9,7 @@
 
 Name: openldap
 Version: 2.4.34
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -46,6 +46,7 @@ Patch12: openldap-tls-no-reuse-of-tls_session.patch
 Patch13: openldap-nss-regex-search-hashed-cacert-dir.patch
 Patch14: openldap-nss-ignore-certdb-type-prefix.patch
 Patch15: openldap-nss-certs-from-certdb-fallback-pem.patch
+Patch16: openldap-syncrepl-delete-retry.patch
 
 # Fedora specific patches
 Patch100: openldap-autoconf-pkgconfig-nss.patch
@@ -164,6 +165,7 @@ ln -s %{_includedir}/nspr4 include/nspr
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %patch102 -p1
 
@@ -644,6 +646,9 @@ exit 0
 %{evolution_connector_prefix}/
 
 %changelog
+* Mon Mar 18 2013 Jan Synáček <jsynacek@redhat.com> 2.4.34-2
+- fix: syncrepl push DELETE operation does not recover (#920482)
+
 * Mon Mar 11 2013 Jan Synáček <jsynacek@redhat.com> 2.4.34-1
 - enable perl backend (#820547)
 - package ppolicy-check-password (#829749)