From 4da5d5861542d15346b6f8fb0e9cf6f6256b6896 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 11 Nov 2006 23:41:08 +0000 Subject: [PATCH] ITS#4744 fix from HEAD --- servers/slapd/saslauthz.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c index 65207a356a..ae461f4af0 100644 --- a/servers/slapd/saslauthz.c +++ b/servers/slapd/saslauthz.c @@ -1607,23 +1607,11 @@ static int sasl_sc_smatch( Operation *o, SlapReply *rs ) { smatch_info *sm = o->o_callback->sc_private; - if ( rs->sr_type != REP_SEARCH ) { - if ( rs->sr_err != LDAP_SUCCESS ) { - sm->match = -1; - } - return 0; - } - - if ( sm->match == 1 ) { - sm->match = -1; - return 0; - } + if (rs->sr_type != REP_SEARCH) return 0; if (dn_match(sm->dn, &rs->sr_entry->e_nname)) { sm->match = 1; - - } else { - sm->match = -1; + return LDAP_UNAVAILABLE; /* short-circuit the search */ } return 0; @@ -1849,7 +1837,7 @@ exact_match: op.o_bd->be_search( &op, &rs ); - if (sm.match == 1) { + if (sm.match) { rc = LDAP_SUCCESS; } else { rc = LDAP_INAPPROPRIATE_AUTH; -- 2.47.2