r23792: convert Samba4 to GPLv3

[jra/samba/.git] / source4 / winbind / wb_cmd_list_trustdom.c

diff --git a/source4/winbind/wb_cmd_list_trustdom.c b/source4/winbind/wb_cmd_list_trustdom.c
index af93ea0643e7a32ed3ecbad1b4ee7036f2f308e2..d849658d7ba4be23f25a78eb8a6b1e9df29ea7d5 100644 (file)
--- a/source4/winbind/wb_cmd_list_trustdom.c
+++ b/source4/winbind/wb_cmd_list_trustdom.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,17 +16,14 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
-#include "winbind/wb_async_helpers.h"
 #include "winbind/wb_server.h"
-#include "smbd/service_stream.h"
 #include "smbd/service_task.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 
 /* List trusted domains. To avoid the trouble with having to wait for other
  * conflicting requests waiting for the lsa pipe we're opening our own lsa
@@ -48,23 +45,21 @@ static void cmd_list_trustdoms_recv_domain(struct composite_context *ctx);
 static void cmd_list_trustdoms_recv_lsa(struct composite_context *ctx);
 static void cmd_list_trustdoms_recv_doms(struct rpc_request *req);
 
-struct composite_context *wb_cmd_list_trustdoms_send(struct wbsrv_service *service)
+struct composite_context *wb_cmd_list_trustdoms_send(TALLOC_CTX *mem_ctx,
+                                                    struct wbsrv_service *service)
 {
        struct composite_context *result, *ctx;
        struct cmd_list_trustdom_state *state;
 
-       result = talloc_zero(NULL, struct composite_context);
+       result = composite_create(mem_ctx, service->task->event_ctx);
        if (result == NULL) goto failed;
-       result->state = COMPOSITE_STATE_IN_PROGRESS;
-       result->async.fn = NULL;
-       result->event_ctx = service->task->event_ctx;
 
        state = talloc(result, struct cmd_list_trustdom_state);
        if (state == NULL) goto failed;
        state->ctx = result;
        result->private_data = state;
 
-       ctx = wb_sid2domain_send(service, service->primary_sid);
+       ctx = wb_sid2domain_send(state, service, service->primary_sid);
        if (ctx == NULL) goto failed;
        ctx->async.fn = cmd_list_trustdoms_recv_domain;
        ctx->async.private_data = state;
@@ -89,8 +84,7 @@ static void cmd_list_trustdoms_recv_domain(struct composite_context *ctx)
        tree = dcerpc_smb_tree(domain->lsa_pipe->conn);
        if (composite_nomem(tree, state->ctx)) return;
 
-       ctx = wb_init_lsa_send(tree, domain->lsa_auth_type,
-                              domain->schannel_creds);
+       ctx = wb_init_lsa_send(state, domain);
        composite_continue(state->ctx, ctx, cmd_list_trustdoms_recv_lsa,
                           state);
 }
@@ -128,7 +122,7 @@ static void cmd_list_trustdoms_recv_lsa(struct composite_context *ctx)
 static void cmd_list_trustdoms_recv_doms(struct rpc_request *req)
 {
        struct cmd_list_trustdom_state *state =
-               talloc_get_type(req->async.private,
+               talloc_get_type(req->async.private_data,
                                struct cmd_list_trustdom_state);
        int i, old_num_domains;