Sync with HEAD

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

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 4ec1e2853623cc309451e45df15684d07d717714..3ce113c13092dd43d6ad152fde305530b5315b6f 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -129,6 +129,11 @@ meta_back_bind( Operation *op, SlapReply *rs )
                        rs->sr_err = lerr;
                        candidates[ i ].sr_tag = META_NOT_CANDIDATE;
 
+                       if ( META_BACK_ONERR_STOP( mi ) ) {
+                               rc = rs->sr_err;
+                               break;
+                       }
+                               
                } else {
                        rc = LDAP_SUCCESS;
                }
@@ -589,6 +594,10 @@ meta_back_dobind(
                         * so better clear the handle
                         */
                        candidates[ i ].sr_tag = META_NOT_CANDIDATE;
+                       if ( META_BACK_ONERR_STOP( mi ) ) {
+                               bound = 0;
+                               goto done;
+                       }
                        continue;
                } /* else */