From: Howard Chu <hyc@openldap.org>
Date: Sun, 12 Nov 2006 00:54:37 +0000 (+0000)
Subject: Short-circuit the mapping search if more than 1 entry is found
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~483
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7a92d4af1f039cf7f5c1038ff546db6896b32099;p=openldap

Short-circuit the mapping search if more than 1 entry is found
---

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 66bd6a6bae..21f191b533 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -1606,7 +1606,7 @@ static int sasl_sc_sasl2dn( Operation *op, SlapReply *rs )
 		Debug( LDAP_DEBUG_TRACE,
 			"%s: slap_sc_sasl2dn: search DN returned more than 1 entry\n",
 			op->o_log_prefix, 0, 0 );
-		return LDAP_OTHER;
+		return LDAP_UNAVAILABLE; /* short-circuit the search */
 	}
 
 	ber_dupbv_x( ndn, &rs->sr_entry->e_nname, op->o_tmpmemctx );