[SSSD] [PATCH] LDAP: Don't reuse a single tevent callback for multiple requests

Jakub Hrozek jhrozek at redhat.com
Wed Sep 10 09:59:55 UTC 2014


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.
-------------- next part --------------
>From c7ed79f27fcc36b2a7a0f47222e1f0c0cf7f9954 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 | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c
index 92dca3a5213b3027c1cef053adf913af319b7102..b955157a115a0a809d612313b656c451b5ff4a1b 100644
--- a/src/providers/ldap/sdap_async.c
+++ b/src/providers/ldap/sdap_async.c
@@ -1821,11 +1821,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 = talloc_get_type(pvt,
+                                            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 +2089,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