DONOTMERGE: FIXME for AD provider

This commit will be removed when AD provider is ported
to new failover.

Author: justin-stephenson

src/providers/ldap/sdap_async_groups.c

@@ -1778,6 +1778,7 @@ struct tevent_req *sdap_get_groups_send(TALLOC_CTX *memctx,
     /* With AD by default the Global Catalog is used for lookup. But the GC
      * group object might not have full group membership data. To make sure we
      * connect to an LDAP server of the group's domain. */
+    /* FIXME: AD use case
     ldap_conn = get_ldap_conn_from_sdom_pvt(state->opts, sdom);
     if (ldap_conn != NULL) {
         state->op = sdap_id_op_create(state, ldap_conn->conn_cache);
@@ -1798,6 +1799,7 @@ struct tevent_req *sdap_get_groups_send(TALLOC_CTX *memctx,
                                 req);
         return req;
     }
+    */
 
     ret = sdap_get_groups_next_base(req);
 
@@ -1810,6 +1812,7 @@ struct tevent_req *sdap_get_groups_send(TALLOC_CTX *memctx,
     return req;
 }
 
+/*
 static void sdap_get_groups_ldap_connect_done(struct tevent_req *subreq)
 {
     struct tevent_req *req;
@@ -1836,6 +1839,7 @@ static void sdap_get_groups_ldap_connect_done(struct tevent_req *subreq)
 
     return;
 }
+*/
 
 static errno_t sdap_get_groups_next_base(struct tevent_req *req)
 {

src/providers/ldap/sdap_async_initgroups_ad.c

@@ -447,7 +447,7 @@ sdap_ad_tokengroups_initgr_mapping_send(TALLOC_CTX *mem_ctx,
     struct tevent_req *req = NULL;
     struct tevent_req *subreq = NULL;
     struct sdap_domain *sdom;
-    struct ad_id_ctx *subdom_id_ctx;
+    //struct ad_id_ctx *subdom_id_ctx;
     errno_t ret;
 
     req = tevent_req_create(mem_ctx, &state,
@@ -486,6 +486,7 @@ sdap_ad_tokengroups_initgr_mapping_send(TALLOC_CTX *mem_ctx,
     }
 
     subdom_id_ctx = talloc_get_type(sdom->pvt, struct ad_id_ctx);
+    /*
     state->op = sdap_id_op_create(state, subdom_id_ctx->ldap_ctx->conn_cache);
     if (!state->op) {
         DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed\n");
@@ -498,6 +499,7 @@ sdap_ad_tokengroups_initgr_mapping_send(TALLOC_CTX *mem_ctx,
         ret = ENOMEM;
         goto immediately;
     }
+    */
 
     tevent_req_set_callback(subreq,
                             sdap_ad_tokengroups_initgr_mapping_connect_done,
@@ -528,16 +530,19 @@ sdap_ad_tokengroups_initgr_mapping_connect_done(struct tevent_req *subreq)
                             struct sdap_ad_tokengroups_initgr_mapping_state);
 
 
+    /*
     ret = sdap_id_op_connect_recv(subreq);
     talloc_zfree(subreq);
 
     if (ret != EOK) {
         tevent_req_error(req, ret);
         return;
     }
+    */
 
     subreq = sdap_get_ad_tokengroups_send(state, state->ev, state->opts,
-                                          sdap_id_op_handle(state->op),
+                                          // sdap_id_op_handle(state->op),
+                                          NULL,
                                           state->username,
                                           state->orig_dn, state->timeout);
     if (subreq == NULL) {
@@ -793,7 +798,7 @@ sdap_ad_tokengroups_initgr_posix_send(TALLOC_CTX *mem_ctx,
     struct tevent_req *req = NULL;
     struct tevent_req *subreq = NULL;
     struct sdap_domain *sdom;
-    struct ad_id_ctx *subdom_id_ctx;
+    //struct ad_id_ctx *subdom_id_ctx;
     errno_t ret;
 
     req = tevent_req_create(mem_ctx, &state,
@@ -832,6 +837,7 @@ sdap_ad_tokengroups_initgr_posix_send(TALLOC_CTX *mem_ctx,
         }
     }
     subdom_id_ctx = talloc_get_type(sdom->pvt, struct ad_id_ctx);
+    /*
     state->op = sdap_id_op_create(state, subdom_id_ctx->ldap_ctx->conn_cache);
     if (!state->op) {
         DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed\n");
@@ -844,6 +850,7 @@ sdap_ad_tokengroups_initgr_posix_send(TALLOC_CTX *mem_ctx,
         ret = ENOMEM;
         goto immediately;
     }
+    */
 
     tevent_req_set_callback(subreq,
                             sdap_ad_tokengroups_initgr_posix_sids_connect_done,
@@ -874,16 +881,19 @@ sdap_ad_tokengroups_initgr_posix_sids_connect_done(struct tevent_req *subreq)
                             struct sdap_ad_tokengroups_initgr_posix_state);
 
 
+/*
     ret = sdap_id_op_connect_recv(subreq);
     talloc_zfree(subreq);
 
     if (ret != EOK) {
         tevent_req_error(req, ret);
         return;
     }
+    */
 
     subreq = sdap_get_ad_tokengroups_send(state, state->ev, state->opts,
-                                          sdap_id_op_handle(state->op),
+                                          // sdap_id_op_handle(state->op),
+                                          NULL,
                                           state->username, state->orig_dn,
                                           state->timeout);
     if (subreq == NULL) {
@@ -1207,6 +1217,7 @@ sdap_ad_get_domain_local_groups_send(TALLOC_CTX *mem_ctx,
         goto fail;
     }
 
+/*
     state->op = sdap_id_op_create(state, state->conn->conn_cache);
     if (state->op == NULL) {
         DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed\n");
@@ -1219,7 +1230,7 @@ sdap_ad_get_domain_local_groups_send(TALLOC_CTX *mem_ctx,
         DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_connect_send failed.\n");
         goto fail;
     }
-
+*/
     tevent_req_set_callback(subreq,
                             sdap_ad_get_domain_local_groups_connect_done, req);
 
@@ -1240,17 +1251,19 @@ sdap_ad_get_domain_local_groups_connect_done(struct tevent_req *subreq)
     struct sdap_ad_get_domain_local_groups_state *state = tevent_req_data(req,
                                   struct sdap_ad_get_domain_local_groups_state);
     int ret;
-
+/*
     ret = sdap_id_op_connect_recv(subreq);
     talloc_zfree(subreq);
 
     if (ret != EOK) {
         tevent_req_error(req, ret);
         return;
     }
+    */
     subreq = rfc2307bis_nested_groups_send(state, state->ev, state->opts,
                                            state->sysdb, state->dom,
-                                           sdap_id_op_handle(state->op),
+                                           //sdap_id_op_handle(state->op),
+                                           NULL,
                                            state->search_bases,
                                            state->groups, state->num_groups,
                                            state->group_hash, 0);