#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"
};
-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);
+ 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;
/* there could be a problem with name resolving itself */
/* issue a monitor message */
if (s->monitor_fn) {
- msg.type = rpc_lookup_name;
+ msg.type = mon_SamrLookupName;
msg_lookup = talloc(s, struct msg_rpc_lookup_name);
- msg_lookup->rid = s->lookup.out.rids.ids;
- msg_lookup->count = s->lookup.out.rids.count;
+ msg_lookup->rid = s->lookup.out.rids->ids;
+ msg_lookup->count = s->lookup.out.rids->count;
msg.data = (void*)msg_lookup;
msg.data_size = sizeof(*msg_lookup);
/* have we actually got name resolved
- we're looking for only one at the moment */
- if (s->lookup.out.rids.count == 0) {
+ if (s->lookup.out.rids->count == 0) {
composite_error(c, NT_STATUS_NO_SUCH_USER);
}
/* prepare parameters for LookupNames */
s->openuser.in.domain_handle = &s->domain_handle;
s->openuser.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
- s->openuser.in.rid = s->lookup.out.rids.ids[0];
+ s->openuser.in.rid = s->lookup.out.rids->ids[0];
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);
+ 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;
if (!NT_STATUS_IS_OK(s->queryuserinfo.out.result)) {
/* issue a monitor message */
if (s->monitor_fn) {
- msg.type = rpc_open_user;
+ msg.type = mon_SamrOpenUser;
msg_open = talloc(s, struct msg_rpc_open_user);
msg_open->rid = s->openuser.in.rid;
msg_open->access_mask = s->openuser.in.access_mask;
/* prepare parameters for QueryUserInfo call */
s->queryuserinfo.in.user_handle = &s->user_handle;
s->queryuserinfo.in.level = s->level;
+ s->queryuserinfo.out.info = talloc(s, union samr_UserInfo *);
+ 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);
+ 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;
/* check if queryuser itself went ok */
return;
}
- s->info = talloc_steal(s, s->queryuserinfo.out.info);
+ s->info = talloc_steal(s, *(s->queryuserinfo.out.info));
/* issue a monitor message */
if (s->monitor_fn) {
- msg.type = rpc_query_user;
+ msg.type = mon_SamrQueryUser;
msg_query = talloc(s, struct msg_rpc_query_user);
msg_query->level = s->queryuserinfo.in.level;
msg.data = (void*)msg_query;
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);
+ 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;
if (!NT_STATUS_IS_OK(s->samrclose.out.result)) {
/* issue a monitor message */
if (s->monitor_fn) {
- msg.type = rpc_close_user;
+ msg.type = mon_SamrClose;
msg_close = talloc(s, struct msg_rpc_close_user);
msg_close->rid = s->openuser.in.rid;
msg.data = (void*)msg_close;
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;
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 */
s->lookup.in.num_names = 1;
s->lookup.in.names = talloc_array(s, struct lsa_String, 1);
if (composite_nomem(s->lookup.in.names, c)) return c;
+ s->lookup.out.rids = talloc_zero(s, struct samr_Ids);
+ s->lookup.out.types = talloc_zero(s, struct samr_Ids);
+ if (composite_nomem(s->lookup.out.rids, c)) return c;
+ if (composite_nomem(s->lookup.out.types, c)) return c;
s->lookup.in.names[0].string = talloc_strdup(s, io->in.username);
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;
git.samba.org / kai / samba.git / blobdiff