import back-ldap/back-meta improvements from 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 219bef4442db59ae50b1664daaf3fab498f2528a..f5cb6206a21c96336db255d46989b3b20b84d607 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -1237,15 +1237,14 @@ meta_back_proxy_authz_cred(
                                        send_ldap_result( op, rs );
                                }
                                LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
+                               goto done;
 
-                       } else {
-                               rs->sr_err = LDAP_SUCCESS;
-                               *binddn = slap_empty_bv;
-                               *bindcred = slap_empty_bv;
-                               break;
                        }
 
-                       goto done;
+                       rs->sr_err = LDAP_SUCCESS;
+                       *binddn = slap_empty_bv;
+                       *bindcred = slap_empty_bv;
+                       break;
 
                } else if ( mt->mt_idassert_authz && !be_isroot( op ) ) {
                        struct berval authcDN;
@@ -1264,15 +1263,13 @@ meta_back_proxy_authz_cred(
                                                send_ldap_result( op, rs );
                                        }
                                        LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
-
-                               } else {
-                                       rs->sr_err = LDAP_SUCCESS;
-                                       *binddn = slap_empty_bv;
-                                       *bindcred = slap_empty_bv;
-                                       break;
+                                       goto done;
                                }
 
-                               goto done;
+                               rs->sr_err = LDAP_SUCCESS;
+                               *binddn = slap_empty_bv;
+                               *bindcred = slap_empty_bv;
+                               break;
                        }
                }