s4-libnet: Fix continue_groupinfo_openuser to check correct state info

[kai/samba-autobuild/.git] / source4 / libnet / userinfo.c

diff --git a/source4/libnet/userinfo.c b/source4/libnet/userinfo.c
index 710154d41e195eddd5e3983dbdeb0725d19227c1..d485eecf5b4856d46d04931b6b1a3d89d3985c50 100644 (file)
--- a/source4/libnet/userinfo.c
+++ b/source4/libnet/userinfo.c
@@ -23,13 +23,10 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
-#include "libnet/composite.h"
 #include "librpc/gen_ndr/security.h"
 #include "libcli/security/security.h"
-#include "libnet/userman.h"
-#include "libnet/userinfo.h"
+#include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "libnet/libnet_proto.h"
 
 
 struct userinfo_state {
@@ -48,28 +45,28 @@ struct userinfo_state {
 };
 
 
-static void continue_userinfo_lookup(struct rpc_request *req);
-static void continue_userinfo_openuser(struct rpc_request *req);
-static void continue_userinfo_getuser(struct rpc_request *req);
-static void continue_userinfo_closeuser(struct rpc_request *req);
+static void continue_userinfo_lookup(struct tevent_req *subreq);
+static void continue_userinfo_openuser(struct tevent_req *subreq);
+static void continue_userinfo_getuser(struct tevent_req *subreq);
+static void continue_userinfo_closeuser(struct tevent_req *subreq);
 
 
 /**
  * Stage 1 (optional): Look for a username in SAM server.
  */
-static void continue_userinfo_lookup(struct rpc_request *req)
+static void continue_userinfo_lookup(struct tevent_req *subreq)
 {
        struct composite_context *c;
        struct userinfo_state *s;
-       struct rpc_request *openuser_req;
        struct monitor_msg msg;
        struct msg_rpc_lookup_name *msg_lookup;
 
-       c = talloc_get_type(req->async.private_data, struct composite_context);
-       s = talloc_get_type(c->private_data, struct userinfo_state);
+       c = tevent_req_callback_data(subreq, struct composite_context);
+       s = talloc_get_type_abort(c->private_data, struct userinfo_state);
 
        /* receive samr_Lookup reply */
-       c->status = dcerpc_ndr_request_recv(req);
+       c->status = dcerpc_samr_LookupNames_r_recv(subreq, s);
+       TALLOC_FREE(subreq);
        if (!composite_is_ok(c)) return;
        
        /* there could be a problem with name resolving itself */
@@ -106,33 +103,35 @@ static void continue_userinfo_lookup(struct rpc_request *req)
        s->openuser.out.user_handle   = &s->user_handle;
 
        /* send request */
-       openuser_req = dcerpc_samr_OpenUser_send(s->pipe, c, &s->openuser);
-       if (composite_nomem(openuser_req, c)) return;
+       subreq = dcerpc_samr_OpenUser_r_send(s, c->event_ctx,
+                                            s->pipe->binding_handle,
+                                            &s->openuser);
+       if (composite_nomem(subreq, c)) return;
 
-       composite_continue_rpc(c, openuser_req, continue_userinfo_openuser, c);
+       tevent_req_set_callback(subreq, continue_userinfo_openuser, c);
 }
 
 
 /**
  * Stage 2: Open user policy handle.
  */
-static void continue_userinfo_openuser(struct rpc_request *req)
+static void continue_userinfo_openuser(struct tevent_req *subreq)
 {
        struct composite_context *c;
        struct userinfo_state *s;
-       struct rpc_request *queryuser_req;
        struct monitor_msg msg;
        struct msg_rpc_open_user *msg_open;
 
-       c = talloc_get_type(req->async.private_data, struct composite_context);
-       s = talloc_get_type(c->private_data, struct userinfo_state);
+       c = tevent_req_callback_data(subreq, struct composite_context);
+       s = talloc_get_type_abort(c->private_data, struct userinfo_state);
 
        /* receive samr_OpenUser reply */
-       c->status = dcerpc_ndr_request_recv(req);
+       c->status = dcerpc_samr_OpenUser_r_recv(subreq, s);
+       TALLOC_FREE(subreq);
        if (!composite_is_ok(c)) return;
 
-       if (!NT_STATUS_IS_OK(s->queryuserinfo.out.result)) {
-               composite_error(c, s->queryuserinfo.out.result);
+       if (!NT_STATUS_IS_OK(s->openuser.out.result)) {
+               composite_error(c, s->openuser.out.result);
                return;
        }
 
@@ -155,29 +154,31 @@ static void continue_userinfo_openuser(struct rpc_request *req)
        if (composite_nomem(s->queryuserinfo.out.info, c)) return;
        
        /* queue rpc call, set event handling and new state */
-       queryuser_req = dcerpc_samr_QueryUserInfo_send(s->pipe, c, &s->queryuserinfo);
-       if (composite_nomem(queryuser_req, c)) return;
+       subreq = dcerpc_samr_QueryUserInfo_r_send(s, c->event_ctx,
+                                                 s->pipe->binding_handle,
+                                                 &s->queryuserinfo);
+       if (composite_nomem(subreq, c)) return;
        
-       composite_continue_rpc(c, queryuser_req, continue_userinfo_getuser, c);
+       tevent_req_set_callback(subreq, continue_userinfo_getuser, c);
 }
 
 
 /**
  * Stage 3: Get requested user information.
  */
-static void continue_userinfo_getuser(struct rpc_request *req)
+static void continue_userinfo_getuser(struct tevent_req *subreq)
 {
        struct composite_context *c;
        struct userinfo_state *s;
-       struct rpc_request *close_req;
        struct monitor_msg msg;
        struct msg_rpc_query_user *msg_query;
 
-       c = talloc_get_type(req->async.private_data, struct composite_context);
-       s = talloc_get_type(c->private_data, struct userinfo_state);
+       c = tevent_req_callback_data(subreq, struct composite_context);
+       s = talloc_get_type_abort(c->private_data, struct userinfo_state);
 
        /* receive samr_QueryUserInfo reply */
-       c->status = dcerpc_ndr_request_recv(req);
+       c->status = dcerpc_samr_QueryUserInfo_r_recv(subreq, s);
+       TALLOC_FREE(subreq);
        if (!composite_is_ok(c)) return;
 
        /* check if queryuser itself went ok */
@@ -204,28 +205,31 @@ static void continue_userinfo_getuser(struct rpc_request *req)
        s->samrclose.out.handle = &s->user_handle;
        
        /* queue rpc call, set event handling and new state */
-       close_req = dcerpc_samr_Close_send(s->pipe, c, &s->samrclose);
-       if (composite_nomem(close_req, c)) return;
+       subreq = dcerpc_samr_Close_r_send(s, c->event_ctx,
+                                         s->pipe->binding_handle,
+                                         &s->samrclose);
+       if (composite_nomem(subreq, c)) return;
        
-       composite_continue_rpc(c, close_req, continue_userinfo_closeuser, c);
+       tevent_req_set_callback(subreq, continue_userinfo_closeuser, c);
 }
 
 
 /**
  * Stage 4: Close policy handle associated with opened user.
  */
-static void continue_userinfo_closeuser(struct rpc_request *req)
+static void continue_userinfo_closeuser(struct tevent_req *subreq)
 {
        struct composite_context *c;
        struct userinfo_state *s;
        struct monitor_msg msg;
        struct msg_rpc_close_user *msg_close;
 
-       c = talloc_get_type(req->async.private_data, struct composite_context);
-       s = talloc_get_type(c->private_data, struct userinfo_state);
+       c = tevent_req_callback_data(subreq, struct composite_context);
+       s = talloc_get_type_abort(c->private_data, struct userinfo_state);
 
        /* receive samr_Close reply */
-       c->status = dcerpc_ndr_request_recv(req);
+       c->status = dcerpc_samr_Close_r_recv(subreq, s);
+       TALLOC_FREE(subreq);
        if (!composite_is_ok(c)) return;
 
        if (!NT_STATUS_IS_OK(s->samrclose.out.result)) {
@@ -261,7 +265,7 @@ struct composite_context *libnet_rpc_userinfo_send(struct dcerpc_pipe *p,
        struct composite_context *c;
        struct userinfo_state *s;
        struct dom_sid *sid;
-       struct rpc_request *openuser_req, *lookup_req;
+       struct tevent_req *subreq;
 
        if (!p || !io) return NULL;
        
@@ -288,10 +292,12 @@ struct composite_context *libnet_rpc_userinfo_send(struct dcerpc_pipe *p,
                s->openuser.out.user_handle   = &s->user_handle;
                
                /* send request */
-               openuser_req = dcerpc_samr_OpenUser_send(p, c, &s->openuser);
-               if (composite_nomem(openuser_req, c)) return c;
+               subreq = dcerpc_samr_OpenUser_r_send(s, c->event_ctx,
+                                                    p->binding_handle,
+                                                    &s->openuser);
+               if (composite_nomem(subreq, c)) return c;
 
-               composite_continue_rpc(c, openuser_req, continue_userinfo_openuser, c);
+               tevent_req_set_callback(subreq, continue_userinfo_openuser, c);
 
        } else {
                /* preparing parameters to send rpc request */
@@ -308,10 +314,12 @@ struct composite_context *libnet_rpc_userinfo_send(struct dcerpc_pipe *p,
                if (composite_nomem(s->lookup.in.names[0].string, c)) return c;
                
                /* send request */
-               lookup_req = dcerpc_samr_LookupNames_send(p, c, &s->lookup);
-               if (composite_nomem(lookup_req, c)) return c;
+               subreq = dcerpc_samr_LookupNames_r_send(s, c->event_ctx,
+                                                       p->binding_handle,
+                                                       &s->lookup);
+               if (composite_nomem(subreq, c)) return c;
                
-               composite_continue_rpc(c, lookup_req, continue_userinfo_lookup, c);
+               tevent_req_set_callback(subreq, continue_userinfo_lookup, c);
        }
 
        return c;
@@ -337,7 +345,7 @@ NTSTATUS libnet_rpc_userinfo_recv(struct composite_context *c, TALLOC_CTX *mem_c
        status = composite_wait(c);
        
        if (NT_STATUS_IS_OK(status) && io) {
-               s = talloc_get_type(c->private_data, struct userinfo_state);
+               s = talloc_get_type_abort(c->private_data, struct userinfo_state);
                talloc_steal(mem_ctx, s->info);
                io->out.info = *s->info;
        }