Changeset 745 for trunk/server/source4/libnet/groupman.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libnet/groupman.c (modified) (9 diffs)

trunk/server/source4/libnet/groupman.c

@@ -39 +39 @@
 
 
-static void continue_groupadd_created(struct rpc_request *req);
+static void continue_groupadd_created(struct tevent_req *subreq);
 
 
@@ -48 +48 @@
         struct composite_context *c;
         struct groupadd_state *s;
-        struct rpc_request *create_req;
+        struct tevent_req *subreq;
 
         if (!p || !io) return NULL;
@@ -77 +77 @@
         s->creategroup.out.rid           = &s->group_rid;
         
-        create_req = dcerpc_samr_CreateDomainGroup_send(s->pipe, c, &s->creategroup);
-        if (composite_nomem(create_req, c)) return c;
-
-        composite_continue_rpc(c, create_req, continue_groupadd_created, c);
+        subreq = dcerpc_samr_CreateDomainGroup_r_send(s, c->event_ctx,
+                                                      s->pipe->binding_handle,
+                                                      &s->creategroup);
+        if (composite_nomem(subreq, c)) return c;
+
+        tevent_req_set_callback(subreq, continue_groupadd_created, c);
         return c;
 }
@@ -100 +102 @@
 
 
-static void continue_groupadd_created(struct rpc_request *req)
+static void continue_groupadd_created(struct tevent_req *subreq)
 {
         struct composite_context *c;
         struct groupadd_state *s;
 
-        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 groupadd_state);
 
-        c->status = dcerpc_ndr_request_recv(req);
+        c->status = dcerpc_samr_CreateDomainGroup_r_recv(subreq, s);
+        TALLOC_FREE(subreq);
         if (!composite_is_ok(c)) return;
 
@@ -141 +144 @@
 
 
-static void continue_groupdel_name_found(struct rpc_request *req);
-static void continue_groupdel_group_opened(struct rpc_request *req);
-static void continue_groupdel_deleted(struct rpc_request *req);
+static void continue_groupdel_name_found(struct tevent_req *subreq);
+static void continue_groupdel_group_opened(struct tevent_req *subreq);
+static void continue_groupdel_deleted(struct tevent_req *subreq);
 
 
@@ -152 +155 @@
         struct composite_context *c;
         struct groupdel_state *s;
-        struct rpc_request *lookup_req;
+        struct tevent_req *subreq;
 
         /* composite context allocation and setup */
@@ -179 +182 @@
 
         /* send the request */
-        lookup_req = dcerpc_samr_LookupNames_send(p, c, &s->lookupname);
-        if (composite_nomem(lookup_req, c)) return c;
-
-        composite_continue_rpc(c, lookup_req, continue_groupdel_name_found, c);
+        subreq = dcerpc_samr_LookupNames_r_send(s, c->event_ctx,
+                                                p->binding_handle,
+                                                &s->lookupname);
+        if (composite_nomem(subreq, c)) return c;
+
+        tevent_req_set_callback(subreq, continue_groupdel_name_found, c);
         return c;
 }
 
 
-static void continue_groupdel_name_found(struct rpc_request *req)
-{
-        struct composite_context *c;
-        struct groupdel_state *s;
-        struct rpc_request *opengroup_req;
-
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+static void continue_groupdel_name_found(struct tevent_req *subreq)
+{
+        struct composite_context *c;
+        struct groupdel_state *s;
+
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(c->private_data, struct groupdel_state);
 
         /* receive samr_LookupNames result */
-        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;
 
@@ -226 +231 @@
 
         /* send rpc request */
-        opengroup_req = dcerpc_samr_OpenGroup_send(s->pipe, c, &s->opengroup);
-        if (composite_nomem(opengroup_req, c)) return;
-
-        composite_continue_rpc(c, opengroup_req, continue_groupdel_group_opened, c);
-}
-
-
-static void continue_groupdel_group_opened(struct rpc_request *req)
-{
-        struct composite_context *c;
-        struct groupdel_state *s;
-        struct rpc_request *delgroup_req;
-
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+        subreq = dcerpc_samr_OpenGroup_r_send(s, c->event_ctx,
+                                              s->pipe->binding_handle,
+                                              &s->opengroup);
+        if (composite_nomem(subreq, c)) return;
+
+        tevent_req_set_callback(subreq, continue_groupdel_group_opened, c);
+}
+
+
+static void continue_groupdel_group_opened(struct tevent_req *subreq)
+{
+        struct composite_context *c;
+        struct groupdel_state *s;
+
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(c->private_data, struct groupdel_state);
 
         /* receive samr_OpenGroup result */
-        c->status = dcerpc_ndr_request_recv(req);
+        c->status = dcerpc_samr_OpenGroup_r_recv(subreq, s);
+        TALLOC_FREE(subreq);
         if (!composite_is_ok(c)) return;
 
@@ -257 +264 @@
         
         /* send rpc request */
-        delgroup_req = dcerpc_samr_DeleteDomainGroup_send(s->pipe, c, &s->deletegroup);
-        if (composite_nomem(delgroup_req, c)) return;
+        subreq = dcerpc_samr_DeleteDomainGroup_r_send(s, c->event_ctx,
+                                                      s->pipe->binding_handle,
+                                                      &s->deletegroup);
+        if (composite_nomem(subreq, c)) return;
 
         /* callback handler setup */
-        composite_continue_rpc(c, delgroup_req, continue_groupdel_deleted, c);
-}
-
-
-static void continue_groupdel_deleted(struct rpc_request *req)
-{
-        struct composite_context *c;
-        struct groupdel_state *s;
-
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+        tevent_req_set_callback(subreq, continue_groupdel_deleted, c);
+}
+
+
+static void continue_groupdel_deleted(struct tevent_req *subreq)
+{
+        struct composite_context *c;
+        struct groupdel_state *s;
+
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(c->private_data, struct groupdel_state);
 
         /* receive samr_DeleteGroup result */
-        c->status = dcerpc_ndr_request_recv(req);
+        c->status = dcerpc_samr_DeleteDomainGroup_r_recv(subreq, s);
+        TALLOC_FREE(subreq);
         if (!composite_is_ok(c)) return;