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

trunk/server/source4/libnet/libnet_user.c

@@ -179 +179 @@
         }
 
+        talloc_free(c);
         return status;
 }
@@ -347 +348 @@
         }
         
+        talloc_free(c);
         return status;
 }
@@ -573 +575 @@
 {
         NTSTATUS status = composite_wait(c);
+
+        talloc_free(c);
         return status;
 }
@@ -869 +873 @@
 
         talloc_free(c);
-        
         return status;
 }
@@ -910 +913 @@
 
 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_users_enumerated(struct rpc_request *req);
+static void continue_users_enumerated(struct tevent_req *subreq);
 
 
@@ -931 +934 @@
         struct composite_context *c;
         struct userlist_state *s;
-        struct rpc_request *query_req;
+        struct tevent_req *subreq;
         bool prereq_met = false;
 
@@ -962 +965 @@
 
         /* 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;
 }
@@ -978 +983 @@
         struct composite_context *c;
         struct userlist_state *s;
-        struct rpc_request *query_req;
+        struct tevent_req *subreq;
         
         c = talloc_get_type(ctx->async.private_data, struct composite_context);
@@ -994 +999 @@
 
         /* 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);
 }
 
@@ -1005 +1012 @@
  * 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 userlist_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 userlist_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;
 
@@ -1039 +1046 @@
 
         /* send the request */
-        enum_req = dcerpc_samr_EnumDomainUsers_send(s->ctx->samr.pipe, c, &s->user_list);
-        if (composite_nomem(enum_req, c)) return;
-
-        composite_continue_rpc(c, enum_req, continue_users_enumerated, c);
+        subreq = dcerpc_samr_EnumDomainUsers_r_send(s, c->event_ctx,
+                                                    s->ctx->samr.pipe->binding_handle,
+                                                    &s->user_list);
+        if (composite_nomem(subreq, c)) return;
+
+        tevent_req_set_callback(subreq, continue_users_enumerated, c);
 }
 
@@ -1054 +1063 @@
         struct composite_context *c;
         struct userlist_state *s;
-        struct rpc_request *enum_req;
+        struct tevent_req *subreq;
 
         c = talloc_get_type(ctx->async.private_data, struct composite_context);
@@ -1075 +1084 @@
         
         /* send the request */
-        enum_req = dcerpc_samr_EnumDomainUsers_send(s->ctx->samr.pipe, c, &s->user_list);
-        if (composite_nomem(enum_req, c)) return;
-
-        composite_continue_rpc(c, enum_req, continue_users_enumerated, c);
+        subreq = dcerpc_samr_EnumDomainUsers_r_send(s, c->event_ctx,
+                                                    s->ctx->samr.pipe->binding_handle,
+                                                    &s->user_list);
+        if (composite_nomem(subreq, c)) return;
+
+        tevent_req_set_callback(subreq, continue_users_enumerated, c);
 }
 
@@ -1085 +1096 @@
  * Stage 2: receive enumerated users and their rids
  */
-static void continue_users_enumerated(struct rpc_request *req)
+static void continue_users_enumerated(struct tevent_req *subreq)
 {
         struct composite_context *c;
         struct userlist_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 userlist_state);
 
         /* receive result of rpc request */
-        c->status = dcerpc_ndr_request_recv(req);
+        c->status = dcerpc_samr_EnumDomainUsers_r_recv(subreq, s);
+        TALLOC_FREE(subreq);
         if (!composite_is_ok(c)) return;
 
@@ -1127 +1139 @@
                         
                         /* username */
-                        s->users[i].username = talloc_strdup(c, entry->name.string);
+                        s->users[i].username = talloc_strdup(s->users, entry->name.string);
                         if (composite_nomem(s->users[i].username, c)) return;
 
                         /* sid string */
-                        s->users[i].sid = dom_sid_string(c, user_sid);
+                        s->users[i].sid = dom_sid_string(s->users, user_sid);
                         if (composite_nomem(s->users[i].sid, c)) return;
                 }
@@ -1160 +1172 @@
 
         if (c == NULL || mem_ctx == NULL || r == NULL) {
+                talloc_free(c);
                 return NT_STATUS_INVALID_PARAMETER;
         }
-        
+
         status = composite_wait(c);
         if (NT_STATUS_IS_OK(status) ||
@@ -1187 +1200 @@
         }
 
+        talloc_free(c);
         return status;
 }