Changeset 740 for vendor/current/source4/libnet/userinfo.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/libnet/userinfo.c (modified) (12 diffs)

vendor/current/source4/libnet/userinfo.c

@@ -46 +46 @@
 
 
-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);
 
 
@@ -55 +55 @@
  * Stage 1 (optional): Look for a username in SAM server.
  */
-static void continue_userinfo_lookup(struct rpc_request *req)
-{
-        struct composite_context *c;
-        struct userinfo_state *s;
-        struct rpc_request *openuser_req;
+static void continue_userinfo_lookup(struct tevent_req *subreq)
+{
+        struct composite_context *c;
+        struct userinfo_state *s;
         struct monitor_msg msg;
         struct msg_rpc_lookup_name *msg_lookup;
 
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(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;
         
@@ -104 +104 @@
 
         /* send request */
-        openuser_req = dcerpc_samr_OpenUser_send(s->pipe, c, &s->openuser);
-        if (composite_nomem(openuser_req, c)) return;
-
-        composite_continue_rpc(c, openuser_req, continue_userinfo_openuser, c);
+        subreq = dcerpc_samr_OpenUser_r_send(s, c->event_ctx,
+                                             s->pipe->binding_handle,
+                                             &s->openuser);
+        if (composite_nomem(subreq, c)) return;
+
+        tevent_req_set_callback(subreq, continue_userinfo_openuser, c);
 }
 
@@ -114 +116 @@
  * Stage 2: Open user policy handle.
  */
-static void continue_userinfo_openuser(struct rpc_request *req)
-{
-        struct composite_context *c;
-        struct userinfo_state *s;
-        struct rpc_request *queryuser_req;
+static void continue_userinfo_openuser(struct tevent_req *subreq)
+{
+        struct composite_context *c;
+        struct userinfo_state *s;
         struct monitor_msg msg;
         struct msg_rpc_open_user *msg_open;
 
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(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;
 
@@ -153 +155 @@
         
         /* 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;
-        
-        composite_continue_rpc(c, queryuser_req, continue_userinfo_getuser, c);
+        subreq = dcerpc_samr_QueryUserInfo_r_send(s, c->event_ctx,
+                                                  s->pipe->binding_handle,
+                                                  &s->queryuserinfo);
+        if (composite_nomem(subreq, c)) return;
+        
+        tevent_req_set_callback(subreq, continue_userinfo_getuser, c);
 }
 
@@ -163 +167 @@
  * Stage 3: Get requested user information.
  */
-static void continue_userinfo_getuser(struct rpc_request *req)
-{
-        struct composite_context *c;
-        struct userinfo_state *s;
-        struct rpc_request *close_req;
+static void continue_userinfo_getuser(struct tevent_req *subreq)
+{
+        struct composite_context *c;
+        struct userinfo_state *s;
         struct monitor_msg msg;
         struct msg_rpc_query_user *msg_query;
 
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(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;
 
@@ -202 +206 @@
         
         /* 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;
-        
-        composite_continue_rpc(c, close_req, continue_userinfo_closeuser, c);
+        subreq = dcerpc_samr_Close_r_send(s, c->event_ctx,
+                                          s->pipe->binding_handle,
+                                          &s->samrclose);
+        if (composite_nomem(subreq, c)) return;
+        
+        tevent_req_set_callback(subreq, continue_userinfo_closeuser, c);
 }
 
@@ -212 +218 @@
  * 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;
@@ -219 +225 @@
         struct msg_rpc_close_user *msg_close;
 
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(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;
 
@@ -259 +266 @@
         struct userinfo_state *s;
         struct dom_sid *sid;
-        struct rpc_request *openuser_req, *lookup_req;
+        struct tevent_req *subreq;
 
         if (!p || !io) return NULL;
@@ -286 +293 @@
                 
                 /* send request */
-                openuser_req = dcerpc_samr_OpenUser_send(p, c, &s->openuser);
-                if (composite_nomem(openuser_req, c)) return c;
-
-                composite_continue_rpc(c, openuser_req, continue_userinfo_openuser, c);
+                subreq = dcerpc_samr_OpenUser_r_send(s, c->event_ctx,
+                                                     p->binding_handle,
+                                                     &s->openuser);
+                if (composite_nomem(subreq, c)) return c;
+
+                tevent_req_set_callback(subreq, continue_userinfo_openuser, c);
 
         } else {
@@ -306 +315 @@
                 
                 /* send request */
-                lookup_req = dcerpc_samr_LookupNames_send(p, c, &s->lookup);
-                if (composite_nomem(lookup_req, c)) return c;
-                
-                composite_continue_rpc(c, lookup_req, continue_userinfo_lookup, c);
+                subreq = dcerpc_samr_LookupNames_r_send(s, c->event_ctx,
+                                                        p->binding_handle,
+                                                        &s->lookup);
+                if (composite_nomem(subreq, c)) return c;
+                
+                tevent_req_set_callback(subreq, continue_userinfo_lookup, c);
         }