From 4a51a17762fb4e7ce1beb0600916fed8b45a5483 Mon Sep 17 00:00:00 2001

From: Mark Reynolds <mreynolds@redhat.com>

Date: Mon, 18 Sep 2017 15:06:06 -0400

Subject: [PATCH] Fix cherry-pick error from sasl mech commit

---

 ldap/servers/slapd/saslbind.c | 3 +++

 1 file changed, 3 insertions(+)

diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c

index 03e2a97..8e94ee6 100644

--- a/ldap/servers/slapd/saslbind.c

+++ b/ldap/servers/slapd/saslbind.c

@@ -745,11 +745,14 @@ char **ids_sasl_listmech(Slapi_PBlock *pb)

     const char *str;

     char *dupstr;

     sasl_conn_t *sasl_conn;

+    Connection *pb_conn = NULL;

     slapi_log_err(SLAPI_LOG_TRACE, "ids_sasl_listmech", "=>\n");

     PR_ASSERT(pb);

+    slapi_pblock_get(pb, SLAPI_CONNECTION, &pb_conn);

+

     /* hard-wired mechanisms and slapi plugin registered mechanisms */

     sup_ret = slapi_get_supported_saslmechanisms_copy();

-- 

2.9.5