Changeset 745 for trunk/server/source4/libnet/libnet_group.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/libnet_group.c (modified) (15 diffs)

trunk/server/source4/libnet/libnet_group.c

@@ -148 +148 @@
         }
 
+        talloc_free(c);
         return status;
 }
@@ -409 +410 @@
 
         talloc_free(c);
-
         return status;
 }
@@ -448 +448 @@
 
 static void continue_lsa_domain_opened(struct composite_context *ctx);
-static void continue_domain_queried(struct rpc_request *req);
+static void continue_domain_queried(struct tevent_req *subreq);
 static void continue_samr_domain_opened(struct composite_context *ctx);
-static void continue_domain_queried(struct rpc_request *req);
-static void continue_groups_enumerated(struct rpc_request *req);
+static void continue_groups_enumerated(struct tevent_req *subreq);
 
 
@@ -470 +469 @@
         struct composite_context *c;
         struct grouplist_state *s;
-        struct rpc_request *query_req;
+        struct tevent_req *subreq;
         bool prereq_met = false;
 
@@ -501 +500 @@
 
         /* send the request */
-        query_req = dcerpc_lsa_QueryInfoPolicy_send(ctx->lsa.pipe, c, &s->query_domain);
-        if (composite_nomem(query_req, c)) return c;
-        
-        composite_continue_rpc(c, query_req, continue_domain_queried, c);
+        subreq = dcerpc_lsa_QueryInfoPolicy_r_send(s, c->event_ctx,
+                                                   ctx->lsa.pipe->binding_handle,
+                                                   &s->query_domain);
+        if (composite_nomem(subreq, c)) return c;
+        
+        tevent_req_set_callback(subreq, continue_domain_queried, c);
         return c;
 }
@@ -517 +518 @@
         struct composite_context *c;
         struct grouplist_state *s;
-        struct rpc_request *query_req;
+        struct tevent_req *subreq;
         
         c = talloc_get_type(ctx->async.private_data, struct composite_context);
@@ -533 +534 @@
 
         /* send the request */
-        query_req = dcerpc_lsa_QueryInfoPolicy_send(s->ctx->lsa.pipe, c, &s->query_domain);
-        if (composite_nomem(query_req, c)) return;
-
-        composite_continue_rpc(c, query_req, continue_domain_queried, c);
+        subreq = dcerpc_lsa_QueryInfoPolicy_r_send(s, c->event_ctx,
+                                                   s->ctx->lsa.pipe->binding_handle,
+                                                   &s->query_domain);
+        if (composite_nomem(subreq, c)) return;
+
+        tevent_req_set_callback(subreq, continue_domain_queried, c);
 }
 
@@ -544 +547 @@
  * provided a valid samr handle is opened
  */
-static void continue_domain_queried(struct rpc_request *req)
+static void continue_domain_queried(struct tevent_req *subreq)
 {
         struct composite_context *c;
         struct grouplist_state *s;
-        struct rpc_request *enum_req;
         bool prereq_met = false;
         
-        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 grouplist_state);
 
         /* receive result of rpc request */
-        c->status = dcerpc_ndr_request_recv(req);
+        c->status = dcerpc_lsa_QueryInfoPolicy_r_recv(subreq, s);
+        TALLOC_FREE(subreq);
         if (!composite_is_ok(c)) return;
 
@@ -577 +580 @@
 
         /* send the request */
-        enum_req = dcerpc_samr_EnumDomainGroups_send(s->ctx->samr.pipe, c, &s->group_list);
-        if (composite_nomem(enum_req, c)) return;
-
-        composite_continue_rpc(c, enum_req, continue_groups_enumerated, c);
+        subreq = dcerpc_samr_EnumDomainGroups_r_send(s, c->event_ctx,
+                                                     s->ctx->samr.pipe->binding_handle,
+                                                     &s->group_list);
+        if (composite_nomem(subreq, c)) return;
+
+        tevent_req_set_callback(subreq, continue_groups_enumerated, c);
 }
 
@@ -592 +597 @@
         struct composite_context *c;
         struct grouplist_state *s;
-        struct rpc_request *enum_req;
+        struct tevent_req *subreq;
 
         c = talloc_get_type(ctx->async.private_data, struct composite_context);
@@ -612 +617 @@
 
         /* send the request */
-        enum_req = dcerpc_samr_EnumDomainGroups_send(s->ctx->samr.pipe, c, &s->group_list);
-        if (composite_nomem(enum_req, c)) return;
-
-        composite_continue_rpc(c, enum_req, continue_groups_enumerated, c);
+        subreq = dcerpc_samr_EnumDomainGroups_r_send(s, c->event_ctx,
+                                                     s->ctx->samr.pipe->binding_handle,
+                                                     &s->group_list);
+        if (composite_nomem(subreq, c)) return;
+
+        tevent_req_set_callback(subreq, continue_groups_enumerated, c);
 }
 
@@ -622 +629 @@
  * Stage 2: receive enumerated groups and their rids
  */
-static void continue_groups_enumerated(struct rpc_request *req)
+static void continue_groups_enumerated(struct tevent_req *subreq)
 {
         struct composite_context *c;
         struct grouplist_state *s;
-        int i;
-
-        c = talloc_get_type(req->async.private_data, struct composite_context);
+        uint32_t i;
+
+        c = tevent_req_callback_data(subreq, struct composite_context);
         s = talloc_get_type(c->private_data, struct grouplist_state);
 
         /* receive result of rpc request */
-        c->status = dcerpc_ndr_request_recv(req);
+        c->status = dcerpc_samr_EnumDomainGroups_r_recv(subreq, s);
+        TALLOC_FREE(subreq);
         if (!composite_is_ok(c)) return;
 
@@ -664 +672 @@
 
                         /* groupname */
-                        s->groups[i].groupname = talloc_strdup(c, entry->name.string);
+                        s->groups[i].groupname = talloc_strdup(s->groups, entry->name.string);
                         if (composite_nomem(s->groups[i].groupname, c)) return;
 
                         /* sid string */
-                        s->groups[i].sid = dom_sid_string(c, group_sid);
+                        s->groups[i].sid = dom_sid_string(s->groups, group_sid);
                         if (composite_nomem(s->groups[i].sid, c)) return;
                 }
@@ -697 +705 @@
 
         if (c == NULL || mem_ctx == NULL || io == NULL) {
+                talloc_free(c);
                 return NT_STATUS_INVALID_PARAMETER;
         }
@@ -724 +733 @@
         }
 
+        talloc_free(c);
         return status;
 }