Blame SOURCES/0039-Ticket-49231-Fix-backport-issue-part2.patch
|
 |
74ca47 |
From fe06dee8f346a8d8ded338bb5080c4cd3b230eef Mon Sep 17 00:00:00 2001
|
|
|
74ca47 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
74ca47 |
Date: Fri, 5 May 2017 18:33:36 -0400
|
|
|
74ca47 |
Subject: [PATCH] Ticket 49231 - Fix backport issue (part2)
|
|
|
74ca47 |
|
|
|
74ca47 |
---
|
|
|
74ca47 |
ldap/servers/slapd/saslbind.c | 2 +-
|
|
|
74ca47 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
74ca47 |
|
|
|
74ca47 |
diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c
|
|
|
74ca47 |
index 8d23c52..75b83fe 100644
|
|
|
74ca47 |
--- a/ldap/servers/slapd/saslbind.c
|
|
|
74ca47 |
+++ b/ldap/servers/slapd/saslbind.c
|
|
|
74ca47 |
@@ -773,7 +773,7 @@ char **ids_sasl_listmech(Slapi_PBlock *pb)
|
|
|
74ca47 |
/* merge into result set */
|
|
|
74ca47 |
dupstr = slapi_ch_strdup(str);
|
|
|
74ca47 |
others = slapi_str2charray_ext(dupstr, ",", 0 /* don't list duplicate mechanisms */);
|
|
|
74ca47 |
- charray_merge(&ret, others, 1);
|
|
|
74ca47 |
+ charray_merge(&sup_ret, others, 1);
|
|
|
74ca47 |
charray_free(others);
|
|
|
74ca47 |
slapi_ch_free((void**)&dupstr);
|
|
|
74ca47 |
}
|
|
|
74ca47 |
--
|
|
|
74ca47 |
2.9.3
|
|
|
74ca47 |
|