Enable libldap debuggingldapdebug

2 files changed, 23 insertions, 0 deletions

diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c
index 84497b75e..ae1611524 100644
--- a/src/providers/ldap/sdap_async.c
+++ b/src/providers/ldap/sdap_async.c
@@ -1111,6 +1111,7 @@ struct sdap_get_generic_ext_state {
     void *cb_data;
 
     bool allow_paging;
+    int old_ldap_debug;
 };
 
 static errno_t sdap_get_generic_ext_step(struct tevent_req *req);
@@ -1274,6 +1275,13 @@ static errno_t sdap_get_generic_ext_step(struct tevent_req *req)
         state->serverctrls[state->nserverctrls+1] = NULL;
     }
 
+    ret = sss_ldap_set_debug(&state->old_ldap_debug);
+    if (ret != EOK) {
+        DEBUG(SSSDBG_MINOR_FAILURE,
+               ("Could not set extra LDAP debugging\n"));
+        /* Not fatal, carry on */
+    }
+
     lret = ldap_search_ext(state->sh->ldap, state->search_base,
                            state->scope, state->filter,
                            discard_const(state->attrs),
@@ -1314,6 +1322,9 @@ static errno_t sdap_get_generic_ext_step(struct tevent_req *req)
     }
 
 done:
+    if (ret != EOK) {
+        sss_ldap_reset_debug(state->old_ldap_debug);
+    }
     return ret;
 }
 
@@ -1333,6 +1344,8 @@ static void sdap_get_generic_ext_done(struct sdap_op *op,
     LDAPControl **returned_controls = NULL;
     LDAPControl *page_control;
 
+    sss_ldap_reset_debug(state->old_ldap_debug);
+
     if (error) {
         tevent_req_error(req, error);
         return;
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index 20f282e3d..0dfcfc637 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -70,6 +70,7 @@ struct sdap_connect_state {
 
     struct sdap_msg *reply;
     int result;
+    int old_ldap_debug;
 };
 
 static void sdap_sys_connect_done(struct tevent_req *subreq);
@@ -129,6 +130,13 @@ struct tevent_req *sdap_connect_send(TALLOC_CTX *memctx,
         goto fail;
     }
 
+    ret = sss_ldap_set_debug(&state->old_ldap_debug);
+    if (ret != EOK) {
+        DEBUG(SSSDBG_MINOR_FAILURE,
+               ("Could not set extra LDAP debugging\n"));
+        /* Not fatal, carry on */
+    }
+
     tevent_req_set_callback(subreq, sdap_sys_connect_done, req);
     return req;
 
@@ -425,6 +433,8 @@ int sdap_connect_recv(struct tevent_req *req,
     struct sdap_connect_state *state = tevent_req_data(req,
                                                   struct sdap_connect_state);
 
+    sss_ldap_reset_debug(state->old_ldap_debug);
+
     TEVENT_REQ_RETURN_ON_ERROR(req);
 
     *sh = talloc_steal(memctx, state->sh);