[SSSD] [PATCH] LDAP: Don't reuse a single tevent callback for multiple requests
Jakub Hrozek
jhrozek at redhat.com
Wed Sep 10 10:17:55 UTC 2014
On Wed, Sep 10, 2014 at 11:59:55AM +0200, Jakub Hrozek wrote:
> On Fri, Sep 05, 2014 at 04:28:00PM +0200, Jakub Hrozek wrote:
> > I will prepare a 1.11 version separately (sadly, the bug is also there)
>
> Luckily it is not :-)
>
> but the referrals are not ignored in sssd-1-11 for deref and ASQ, which
> is what this patch implements.
Sorry, I forgot to squash in one more change.
-------------- next part --------------
>From 0ae2469ef63bcb6f7c2bd9b0f24fbb194dba60a7 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Wed, 10 Sep 2014 11:55:24 +0200
Subject: [PATCH] Ignore referrals in deref and ASQ, too
---
src/providers/ldap/sdap_async.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c
index 92dca3a5213b3027c1cef053adf913af319b7102..cf310d8d5257dc2f1ac5ae4df172ea648898eaca 100644
--- a/src/providers/ldap/sdap_async.c
+++ b/src/providers/ldap/sdap_async.c
@@ -1645,6 +1645,7 @@ static errno_t sdap_x_deref_parse_entry(struct sdap_handle *sh,
struct sdap_x_deref_search_state {
struct sdap_handle *sh;
struct sdap_op *op;
+ struct sdap_options *opts;
struct sdap_attr_map_info *maps;
LDAPControl **ctrls;
@@ -1670,6 +1671,7 @@ sdap_x_deref_search_send(TALLOC_CTX *memctx, struct tevent_context *ev,
state->sh = sh;
state->maps = maps;
state->op = NULL;
+ state->opts = opts;
state->num_maps = num_maps;
state->ctrls = talloc_zero_array(state, LDAPControl *, 2);
if (state->ctrls == NULL) {
@@ -1821,11 +1823,18 @@ static void sdap_x_deref_search_done(struct tevent_req *subreq)
{
struct tevent_req *req = tevent_req_callback_data(subreq,
struct tevent_req);
+ struct sdap_x_deref_search_state *state = tevent_req_data(req,
+ struct sdap_x_deref_search_state);
int ret;
ret = sdap_get_generic_ext_recv(subreq);
talloc_zfree(subreq);
- if (ret) {
+ if (ret == ERR_REFERRAL) {
+ if (dp_opt_get_bool(state->opts->basic, SDAP_REFERRALS)) {
+ tevent_req_error(req, ret);
+ return;
+ }
+ } else if (ret) {
DEBUG(SSSDBG_CONF_SETTINGS,
"sdap_get_generic_ext_recv failed [%d]: %s\n",
ret, sss_strerror(ret));
@@ -2082,11 +2091,18 @@ static void sdap_asq_search_done(struct tevent_req *subreq)
{
struct tevent_req *req = tevent_req_callback_data(subreq,
struct tevent_req);
+ struct sdap_asq_search_state *state =
+ tevent_req_data(req, struct sdap_asq_search_state);
int ret;
ret = sdap_get_generic_ext_recv(subreq);
talloc_zfree(subreq);
- if (ret) {
+ if (ret == ERR_REFERRAL) {
+ if (dp_opt_get_bool(state->opts->basic, SDAP_REFERRALS)) {
+ tevent_req_error(req, ret);
+ return;
+ }
+ } else if (ret) {
DEBUG(SSSDBG_CONF_SETTINGS,
"sdap_get_generic_ext_recv failed [%d]: %s\n",
ret, sss_strerror(ret));
--
1.9.3
More information about the sssd-devel
mailing list