Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / back-meta / conn.c

diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index 7e63fae89604e8b031dd868addb8bf5378b96c71..d2e3c4399aee03469dd8eedab256fdb999e9b5d2 100644 (file)
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2013 The OpenLDAP Foundation.
+ * Copyright 1999-2014 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -787,10 +787,12 @@ meta_back_retry(
                                        LDAP_BACK_CONN_BINDING_CLEAR( msc );
                                }
                        }
-               }
+               }
 
+#if 0  /* ITS#7591, following stmt drops needed result msgs */
                /* don't send twice */
                sendok &= ~LDAP_BACK_SENDERR;
+#endif
        }
 
        if ( rc != LDAP_SUCCESS ) {