From: Rein Tollevik <rein@openldap.org>
Date: Wed, 6 Jan 2010 13:55:35 +0000 (+0000)
Subject: ITS#6441 cyrus-sasl 2.1.24 auxprop_lookup plugin returns status.
X-Git-Tag: MIGRATION_CVS2GIT~715
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fdd2c3a5a721ced6053996dbd12618591c9d013e;p=openldap

ITS#6441 cyrus-sasl 2.1.24 auxprop_lookup plugin returns status.
---

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 279731f40b..1cb997428e 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -258,7 +258,11 @@ sasl_ap_lookup( Operation *op, SlapReply *rs )
 	return LDAP_SUCCESS;
 }
 
+#if SASL_VERSION_FULL >= 0x020118
+static int
+#else
 static void
+#endif
 slap_auxprop_lookup(
 	void *glob_context,
 	sasl_server_params_t *sparams,
@@ -271,6 +275,7 @@ slap_auxprop_lookup(
 	int i, doit = 0;
 	Connection *conn = NULL;
 	lookup_info sl;
+	int rc = LDAP_SUCCESS;
 
 	sl.list = sparams->utils->prop_get( sparams->propctx );
 	sl.sparams = sparams;
@@ -402,10 +407,13 @@ slap_auxprop_lookup(
 				/* FIXME: we want all attributes, right? */
 				op->ors_attrs = NULL;
 
-				op->o_bd->be_search( op, &rs );
+				rc = op->o_bd->be_search( op, &rs );
 			}
 		}
 	}
+#if SASL_VERSION_FULL >= 0x020118
+	return rc != LDAP_SUCCESS ? SASL_FAIL : SASL_OK;
+#endif
 }
 
 #if SASL_VERSION_FULL >= 0x020110