This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#include "includes.h"
#include "libcli/composite/composite.h"
-#include "libnet/composite.h"
-#include "libnet/userman.h"
-#include "libnet/userinfo.h"
+#include "libnet/libnet.h"
#include "librpc/gen_ndr/ndr_samr_c.h"
/*
* Composite USER ADD functionality
*/
-static void useradd_handler(struct rpc_request*);
-
-enum useradd_stage { USERADD_CREATE };
-
struct useradd_state {
- enum useradd_stage stage;
struct dcerpc_pipe *pipe;
- struct rpc_request *req;
struct policy_handle domain_handle;
struct samr_CreateUser createuser;
struct policy_handle user_handle;
};
+static void continue_useradd_create(struct tevent_req *subreq);
+
+
/**
* Stage 1 (and the only one for now): Create user account.
*/
-static NTSTATUS useradd_create(struct composite_context *c,
- struct useradd_state *s)
+static void continue_useradd_create(struct tevent_req *subreq)
{
- c->status = dcerpc_ndr_request_recv(s->req);
- NT_STATUS_NOT_OK_RETURN(c->status);
-
- c->state = COMPOSITE_STATE_DONE;
- return NT_STATUS_OK;
-}
+ struct composite_context *c;
+ struct useradd_state *s;
+ c = tevent_req_callback_data(subreq, struct composite_context);
+ s = talloc_get_type(c->private_data, struct useradd_state);
-/**
- * Event handler for asynchronous request. Handles transition through
- * intermediate stages of the call.
- *
- * @param req rpc call context
- */
-static void useradd_handler(struct rpc_request *req)
-{
- struct composite_context *c = req->async.private;
- struct useradd_state *s = talloc_get_type(c->private_data, struct useradd_state);
- struct monitor_msg msg;
- struct msg_rpc_create_user *rpc_create;
-
- switch (s->stage) {
- case USERADD_CREATE:
- c->status = useradd_create(c, s);
-
- /* prepare a message to pass to monitor function */
- msg.type = rpc_create_user;
- rpc_create = talloc(s, struct msg_rpc_create_user);
- rpc_create->rid = *s->createuser.out.rid;
- msg.data = (void*)rpc_create;
- msg.data_size = sizeof(*rpc_create);
- break;
- }
+ /* check rpc layer status code */
+ c->status = dcerpc_samr_CreateUser_r_recv(subreq, s);
+ TALLOC_FREE(subreq);
+ if (!composite_is_ok(c)) return;
- /* are we ok so far ? */
- if (!NT_STATUS_IS_OK(c->status)) {
- c->state = COMPOSITE_STATE_ERROR;
- }
+ /* check create user call status code */
+ c->status = s->createuser.out.result;
- /* call monitor function provided the pointer has been passed */
+ /* get created user account data */
+ s->user_handle = *s->createuser.out.user_handle;
+ s->user_rid = *s->createuser.out.rid;
+
+ /* issue a monitor message */
if (s->monitor_fn) {
- s->monitor_fn(&msg);
- }
+ struct monitor_msg msg;
+ struct msg_rpc_create_user rpc_create;
+
+ rpc_create.rid = *s->createuser.out.rid;
- /* are we done yet ? */
- if (c->state >= COMPOSITE_STATE_DONE &&
- c->async.fn) {
- c->async.fn(c);
+ msg.type = mon_SamrCreateUser;
+ msg.data = (void*)&rpc_create;
+ msg.data_size = sizeof(rpc_create);
+
+ s->monitor_fn(&msg);
}
+
+ composite_done(c);
}
{
struct composite_context *c;
struct useradd_state *s;
+ struct tevent_req *subreq;
+
+ if (!p || !io) return NULL;
/* composite allocation and setup */
- c = talloc_zero(p, struct composite_context);
+ c = composite_create(p, dcerpc_event_context(p));
if (c == NULL) return NULL;
s = talloc_zero(c, struct useradd_state);
if (composite_nomem(s, c)) return c;
- c->state = COMPOSITE_STATE_IN_PROGRESS;
c->private_data = s;
- c->event_ctx = dcerpc_event_context(p);
/* put passed arguments to the state structure */
s->domain_handle = io->in.domain_handle;
/* preparing parameters to send rpc request */
s->createuser.in.domain_handle = &io->in.domain_handle;
+
s->createuser.in.account_name = talloc_zero(c, struct lsa_String);
+ if (composite_nomem(s->createuser.in.account_name, c)) return c;
+
s->createuser.in.account_name->string = talloc_strdup(c, io->in.username);
+ if (composite_nomem(s->createuser.in.account_name->string, c)) return c;
+
s->createuser.out.user_handle = &s->user_handle;
s->createuser.out.rid = &s->user_rid;
/* send the request */
- s->req = dcerpc_samr_CreateUser_send(p, c, &s->createuser);
- if (composite_nomem(s->req, c)) return c;
-
- /* callback handler for continuation */
- s->req->async.callback = useradd_handler;
- s->req->async.private = c;
- s->stage = USERADD_CREATE;
+ subreq = dcerpc_samr_CreateUser_r_send(s, c->event_ctx,
+ p->binding_handle,
+ &s->createuser);
+ if (composite_nomem(subreq, c)) return c;
+ tevent_req_set_callback(subreq, continue_useradd_create, c);
return c;
}
* Composite USER DELETE functionality
*/
-static void userdel_handler(struct rpc_request*);
-
-enum userdel_stage { USERDEL_LOOKUP, USERDEL_OPEN, USERDEL_DELETE };
struct userdel_state {
- enum userdel_stage stage;
struct dcerpc_pipe *pipe;
- struct rpc_request *req;
struct policy_handle domain_handle;
struct policy_handle user_handle;
struct samr_LookupNames lookupname;
};
+static void continue_userdel_name_found(struct tevent_req *subreq);
+static void continue_userdel_user_opened(struct tevent_req *subreq);
+static void continue_userdel_deleted(struct tevent_req *subreq);
+
+
/**
* Stage 1: Lookup the user name and resolve it to rid
*/
-static NTSTATUS userdel_lookup(struct composite_context *c,
- struct userdel_state *s)
+static void continue_userdel_name_found(struct tevent_req *subreq)
{
+ struct composite_context *c;
+ struct userdel_state *s;
+ struct monitor_msg msg;
+
+ c = tevent_req_callback_data(subreq, struct composite_context);
+ s = talloc_get_type(c->private_data, struct userdel_state);
+
/* receive samr_LookupNames result */
- c->status = dcerpc_ndr_request_recv(s->req);
- NT_STATUS_NOT_OK_RETURN(c->status);
+ c->status = dcerpc_samr_LookupNames_r_recv(subreq, s);
+ TALLOC_FREE(subreq);
+ if (!composite_is_ok(c)) return;
+
+ c->status = s->lookupname.out.result;
+ if (!NT_STATUS_IS_OK(c->status)) {
+ composite_error(c, c->status);
+ return;
+ }
/* what to do when there's no user account to delete
and what if there's more than one rid resolved */
- if (!s->lookupname.out.rids.count) {
+ if (!s->lookupname.out.rids->count) {
c->status = NT_STATUS_NO_SUCH_USER;
composite_error(c, c->status);
+ return;
- } else if (!s->lookupname.out.rids.count > 1) {
+ } else if (!s->lookupname.out.rids->count > 1) {
c->status = NT_STATUS_INVALID_ACCOUNT_NAME;
composite_error(c, c->status);
+ return;
}
- /* prepare the next rpc call arguments */
+ /* issue a monitor message */
+ if (s->monitor_fn) {
+ struct msg_rpc_lookup_name msg_lookup;
+
+ msg_lookup.rid = s->lookupname.out.rids->ids;
+ msg_lookup.count = s->lookupname.out.rids->count;
+
+ msg.type = mon_SamrLookupName;
+ msg.data = (void*)&msg_lookup;
+ msg.data_size = sizeof(msg_lookup);
+ s->monitor_fn(&msg);
+ }
+
+ /* prepare the arguments for rpc call */
s->openuser.in.domain_handle = &s->domain_handle;
- s->openuser.in.rid = s->lookupname.out.rids.ids[0];
+ s->openuser.in.rid = s->lookupname.out.rids->ids[0];
s->openuser.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
s->openuser.out.user_handle = &s->user_handle;
/* send rpc request */
- s->req = dcerpc_samr_OpenUser_send(s->pipe, c, &s->openuser);
- if (s->req == NULL) return NT_STATUS_NO_MEMORY;
+ subreq = dcerpc_samr_OpenUser_r_send(s, c->event_ctx,
+ s->pipe->binding_handle,
+ &s->openuser);
+ if (composite_nomem(subreq, c)) return;
- /* callback handler setup */
- s->req->async.callback = userdel_handler;
- s->req->async.private = c;
- s->stage = USERDEL_OPEN;
-
- return NT_STATUS_OK;
+ tevent_req_set_callback(subreq, continue_userdel_user_opened, c);
}
/**
* Stage 2: Open user account.
*/
-static NTSTATUS userdel_open(struct composite_context *c,
- struct userdel_state *s)
+static void continue_userdel_user_opened(struct tevent_req *subreq)
{
+ struct composite_context *c;
+ struct userdel_state *s;
+ struct monitor_msg msg;
+
+ c = tevent_req_callback_data(subreq, struct composite_context);
+ s = talloc_get_type(c->private_data, struct userdel_state);
+
/* receive samr_OpenUser result */
- c->status = dcerpc_ndr_request_recv(s->req);
- NT_STATUS_NOT_OK_RETURN(c->status);
+ c->status = dcerpc_samr_OpenUser_r_recv(subreq, s);
+ TALLOC_FREE(subreq);
+ if (!composite_is_ok(c)) return;
+
+ c->status = s->openuser.out.result;
+ if (!NT_STATUS_IS_OK(c->status)) {
+ composite_error(c, c->status);
+ return;
+ }
+
+ /* issue a monitor message */
+ if (s->monitor_fn) {
+ struct msg_rpc_open_user msg_open;
+
+ msg_open.rid = s->openuser.in.rid;
+ msg_open.access_mask = s->openuser.in.access_mask;
+
+ msg.type = mon_SamrOpenUser;
+ msg.data = (void*)&msg_open;
+ msg.data_size = sizeof(msg_open);
+ s->monitor_fn(&msg);
+ }
/* prepare the final rpc call arguments */
s->deleteuser.in.user_handle = &s->user_handle;
s->deleteuser.out.user_handle = &s->user_handle;
/* send rpc request */
- s->req = dcerpc_samr_DeleteUser_send(s->pipe, c, &s->deleteuser);
- if (s->req == NULL) return NT_STATUS_NO_MEMORY;
+ subreq = dcerpc_samr_DeleteUser_r_send(s, c->event_ctx,
+ s->pipe->binding_handle,
+ &s->deleteuser);
+ if (composite_nomem(subreq, c)) return;
/* callback handler setup */
- s->req->async.callback = userdel_handler;
- s->req->async.private = c;
- s->stage = USERDEL_DELETE;
-
- return NT_STATUS_OK;
+ tevent_req_set_callback(subreq, continue_userdel_deleted, c);
}
/**
* Stage 3: Delete user account
*/
-static NTSTATUS userdel_delete(struct composite_context *c,
- struct userdel_state *s)
-{
- /* receive samr_DeleteUser result */
- c->status = dcerpc_ndr_request_recv(s->req);
- NT_STATUS_NOT_OK_RETURN(c->status);
-
- c->state = COMPOSITE_STATE_DONE;
-
- return NT_STATUS_OK;
-}
-
-
-/**
- * Event handler for asynchronous request. Handles transition through
- * intermediate stages of the call.
- *
- * @param req rpc call context
- */
-static void userdel_handler(struct rpc_request *req)
+static void continue_userdel_deleted(struct tevent_req *subreq)
{
struct composite_context *c;
struct userdel_state *s;
struct monitor_msg msg;
- struct msg_rpc_lookup_name *msg_lookup;
- struct msg_rpc_open_user *msg_open;
- c = talloc_get_type(req->async.private, struct composite_context);
+ c = tevent_req_callback_data(subreq, struct composite_context);
s = talloc_get_type(c->private_data, struct userdel_state);
-
- switch (s->stage) {
- case USERDEL_LOOKUP:
- c->status = userdel_lookup(c, s);
-
- /* monitor message */
- msg.type = rpc_lookup_name;
- msg_lookup = talloc(s, struct msg_rpc_lookup_name);
-
- msg_lookup->rid = s->lookupname.out.rids.ids;
- msg_lookup->count = s->lookupname.out.rids.count;
- msg.data = (void*)msg_lookup;
- msg.data_size = sizeof(*msg_lookup);
- break;
-
- case USERDEL_OPEN:
- c->status = userdel_open(c, s);
-
- /* monitor message */
- msg.type = rpc_open_user;
- msg_open = talloc(s, struct msg_rpc_open_user);
-
- msg_open->rid = s->openuser.in.rid;
- msg_open->access_mask = s->openuser.in.rid;
- msg.data = (void*)msg_open;
- msg.data_size = sizeof(*msg_open);
- break;
-
- case USERDEL_DELETE:
- c->status = userdel_delete(c, s);
-
- /* monitor message */
- msg.type = rpc_delete_user;
- msg.data = NULL;
- msg.data_size = 0;
- break;
- }
- /* are we ok, so far ? */
+ /* receive samr_DeleteUser result */
+ c->status = dcerpc_samr_DeleteUser_r_recv(subreq, s);
+ TALLOC_FREE(subreq);
+ if (!composite_is_ok(c)) return;
+
+ /* return the actual function call status */
+ c->status = s->deleteuser.out.result;
if (!NT_STATUS_IS_OK(c->status)) {
- c->state = COMPOSITE_STATE_ERROR;
+ composite_error(c, c->status);
+ return;
}
-
- /* call monitor function provided the pointer has been passed */
+
+ /* issue a monitor message */
if (s->monitor_fn) {
+ msg.type = mon_SamrDeleteUser;
+ msg.data = NULL;
+ msg.data_size = 0;
s->monitor_fn(&msg);
}
- /* are we done yet */
- if (c->state >= COMPOSITE_STATE_DONE &&
- c->async.fn) {
- c->async.fn(c);
- }
+ composite_done(c);
}
{
struct composite_context *c;
struct userdel_state *s;
+ struct tevent_req *subreq;
/* composite context allocation and setup */
- c = talloc_zero(p, struct composite_context);
+ c = composite_create(p, dcerpc_event_context(p));
if (c == NULL) return NULL;
s = talloc_zero(c, struct userdel_state);
if (composite_nomem(s, c)) return c;
- c->state = COMPOSITE_STATE_IN_PROGRESS;
c->private_data = s;
- c->event_ctx = dcerpc_event_context(p);
/* store function parameters in the state structure */
s->pipe = p;
s->lookupname.in.num_names = 1;
s->lookupname.in.names = talloc_zero(s, struct lsa_String);
s->lookupname.in.names->string = io->in.username;
+ s->lookupname.out.rids = talloc_zero(s, struct samr_Ids);
+ s->lookupname.out.types = talloc_zero(s, struct samr_Ids);
+ if (composite_nomem(s->lookupname.out.rids, c)) return c;
+ if (composite_nomem(s->lookupname.out.types, c)) return c;
/* send the request */
- s->req = dcerpc_samr_LookupNames_send(p, c, &s->lookupname);
-
- /* callback handler setup */
- s->req->async.callback = userdel_handler;
- s->req->async.private = c;
- s->stage = USERDEL_LOOKUP;
+ subreq = dcerpc_samr_LookupNames_r_send(s, c->event_ctx,
+ p->binding_handle,
+ &s->lookupname);
+ if (composite_nomem(subreq, c)) return c;
+ /* set the next stage */
+ tevent_req_set_callback(subreq, continue_userdel_name_found, c);
return c;
}
* USER MODIFY functionality
*/
-static void usermod_handler(struct rpc_request*);
+static void continue_usermod_name_found(struct tevent_req *subreq);
+static void continue_usermod_user_opened(struct tevent_req *subreq);
+static void continue_usermod_user_queried(struct tevent_req *subreq);
+static void continue_usermod_user_changed(struct tevent_req *subreq);
-enum usermod_stage { USERMOD_LOOKUP, USERMOD_OPEN, USERMOD_QUERY, USERMOD_MODIFY };
struct usermod_state {
- enum usermod_stage stage;
struct dcerpc_pipe *pipe;
- struct rpc_request *req;
struct policy_handle domain_handle;
struct policy_handle user_handle;
struct usermod_change change;
/**
* Step 1: Lookup user name
*/
-static NTSTATUS usermod_lookup(struct composite_context *c,
- struct usermod_state *s)
+static void continue_usermod_name_found(struct tevent_req *subreq)
{
+ struct composite_context *c;
+ struct usermod_state *s;
+ struct monitor_msg msg;
+
+ c = tevent_req_callback_data(subreq, struct composite_context);
+ s = talloc_get_type(c->private_data, struct usermod_state);
+
/* receive samr_LookupNames result */
- c->status = dcerpc_ndr_request_recv(s->req);
- NT_STATUS_NOT_OK_RETURN(c->status);
+ c->status = dcerpc_samr_LookupNames_r_recv(subreq, s);
+ TALLOC_FREE(subreq);
+ if (!composite_is_ok(c)) return;
+
+ c->status = s->lookupname.out.result;
+ if (!NT_STATUS_IS_OK(c->status)) {
+ composite_error(c, c->status);
+ return;
+ }
/* what to do when there's no user account to delete
and what if there's more than one rid resolved */
- if (!s->lookupname.out.rids.count) {
+ if (!s->lookupname.out.rids->count) {
c->status = NT_STATUS_NO_SUCH_USER;
- c->state = COMPOSITE_STATE_ERROR;
- return c->status;
+ composite_error(c, c->status);
+ return;
- } else if (!s->lookupname.out.rids.count > 1) {
+ } else if (!s->lookupname.out.rids->count > 1) {
c->status = NT_STATUS_INVALID_ACCOUNT_NAME;
- c->state = COMPOSITE_STATE_ERROR;
- return c->status;
+ composite_error(c, c->status);
+ return;
+ }
+
+ /* issue a monitor message */
+ if (s->monitor_fn) {
+ struct msg_rpc_lookup_name msg_lookup;
+
+ msg_lookup.rid = s->lookupname.out.rids->ids;
+ msg_lookup.count = s->lookupname.out.rids->count;
+
+ msg.type = mon_SamrLookupName;
+ msg.data = (void*)&msg_lookup;
+ msg.data_size = sizeof(msg_lookup);
+ s->monitor_fn(&msg);
}
/* prepare the next rpc call */
s->openuser.in.domain_handle = &s->domain_handle;
- s->openuser.in.rid = s->lookupname.out.rids.ids[0];
+ s->openuser.in.rid = s->lookupname.out.rids->ids[0];
s->openuser.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
s->openuser.out.user_handle = &s->user_handle;
/* send the rpc request */
- s->req = dcerpc_samr_OpenUser_send(s->pipe, c, &s->openuser);
+ subreq = dcerpc_samr_OpenUser_r_send(s, c->event_ctx,
+ s->pipe->binding_handle,
+ &s->openuser);
+ if (composite_nomem(subreq, c)) return;
- /* callback handler setup */
- s->req->async.callback = usermod_handler;
- s->req->async.private = c;
- s->stage = USERMOD_OPEN;
-
- return NT_STATUS_OK;
+ tevent_req_set_callback(subreq, continue_usermod_user_opened, c);
}
* function are made until there's no flags set meaning that all of the
* changes have been made.
*/
-static uint32_t usermod_setfields(struct usermod_state *s, uint16_t *level,
- union samr_UserInfo *i)
+static bool usermod_setfields(struct usermod_state *s, uint16_t *level,
+ union samr_UserInfo *i, bool queried)
{
- if (s->change.fields) {
- if (s->change.fields & USERMOD_FIELD_ACCOUNT_NAME) {
- *level = 7;
- i->info7.account_name.string = s->change.account_name;
+ if (s->change.fields == 0) return s->change.fields;
- s->change.fields ^= USERMOD_FIELD_ACCOUNT_NAME;
+ *level = 0;
- } else if (s->change.fields & USERMOD_FIELD_FULL_NAME) {
- *level = 8;
- i->info8.full_name.string = s->change.full_name;
-
- s->change.fields ^= USERMOD_FIELD_FULL_NAME;
-
- } else if (s->change.fields & USERMOD_FIELD_DESCRIPTION) {
- *level = 13;
- i->info13.description.string = s->change.description;
-
- s->change.fields ^= USERMOD_FIELD_DESCRIPTION;
-
- } else if (s->change.fields & USERMOD_FIELD_COMMENT) {
- *level = 2;
-
- if (s->stage == USERMOD_QUERY) {
- /* the user info is obtained, so now set the required field */
- i->info2.comment.string = s->change.comment;
- s->change.fields ^= USERMOD_FIELD_COMMENT;
+ if ((s->change.fields & USERMOD_FIELD_ACCOUNT_NAME) &&
+ (*level == 0 || *level == 7)) {
+ *level = 7;
+ i->info7.account_name.string = s->change.account_name;
+
+ s->change.fields ^= USERMOD_FIELD_ACCOUNT_NAME;
+ }
- } else {
- /* we need to query the user info before setting one field in it */
- s->stage = USERMOD_QUERY;
- return s->change.fields;
- }
+ if ((s->change.fields & USERMOD_FIELD_FULL_NAME) &&
+ (*level == 0 || *level == 8)) {
+ *level = 8;
+ i->info8.full_name.string = s->change.full_name;
+
+ s->change.fields ^= USERMOD_FIELD_FULL_NAME;
+ }
+
+ if ((s->change.fields & USERMOD_FIELD_DESCRIPTION) &&
+ (*level == 0 || *level == 13)) {
+ *level = 13;
+ i->info13.description.string = s->change.description;
+
+ s->change.fields ^= USERMOD_FIELD_DESCRIPTION;
+ }
- } else if (s->change.fields & USERMOD_FIELD_ALLOW_PASS_CHG) {
- *level = 3;
+ if ((s->change.fields & USERMOD_FIELD_COMMENT) &&
+ (*level == 0 || *level == 2)) {
+ *level = 2;
+
+ if (queried) {
+ /* the user info is obtained, so now set the required field */
+ i->info2.comment.string = s->change.comment;
+ s->change.fields ^= USERMOD_FIELD_COMMENT;
- if (s->stage == USERMOD_QUERY) {
- i->info3.allow_password_change = timeval_to_nttime(s->change.allow_password_change);
- s->change.fields ^= USERMOD_FIELD_ALLOW_PASS_CHG;
-
- } else {
- s->stage = USERMOD_QUERY;
- return s->change.fields;
- }
-
- } else if (s->change.fields & USERMOD_FIELD_FORCE_PASS_CHG) {
- *level = 3;
-
- if (s->stage == USERMOD_QUERY) {
- i->info3.force_password_change = timeval_to_nttime(s->change.force_password_change);
- s->change.fields ^= USERMOD_FIELD_FORCE_PASS_CHG;
-
- } else {
- s->stage = USERMOD_QUERY;
- return s->change.fields;
- }
+ } else {
+ /* we need to query the user info before setting one field in it */
+ return false;
+ }
+ }
- } else if (s->change.fields & USERMOD_FIELD_LAST_LOGON) {
- *level = 3;
-
- if (s->stage == USERMOD_QUERY) {
- i->info3.last_logon = timeval_to_nttime(s->change.last_logon);
- s->change.fields ^= USERMOD_FIELD_LAST_LOGON;
- } else {
- s->stage = USERMOD_QUERY;
- return s->change.fields;
- }
+ if ((s->change.fields & USERMOD_FIELD_LOGON_SCRIPT) &&
+ (*level == 0 || *level == 11)) {
+ *level = 11;
+ i->info11.logon_script.string = s->change.logon_script;
- } else if (s->change.fields & USERMOD_FIELD_LAST_LOGOFF) {
- *level = 3;
-
- if (s->stage == USERMOD_QUERY) {
- i->info3.last_logoff = timeval_to_nttime(s->change.last_logoff);
- s->change.fields ^= USERMOD_FIELD_LAST_LOGOFF;
- } else {
- s->stage = USERMOD_QUERY;
- return s->change.fields;
- }
-
- } else if (s->change.fields & USERMOD_FIELD_LAST_PASS_CHG) {
- *level = 3;
-
- if (s->stage == USERMOD_QUERY) {
- i->info3.last_password_change = timeval_to_nttime(s->change.last_password_change);
- s->change.fields ^= USERMOD_FIELD_LAST_PASS_CHG;
- } else {
- s->stage = USERMOD_QUERY;
- return s->change.fields;
- }
-
- } else if (s->change.fields & USERMOD_FIELD_LOGON_SCRIPT) {
- *level = 11;
- i->info11.logon_script.string = s->change.logon_script;
-
- s->change.fields ^= USERMOD_FIELD_LOGON_SCRIPT;
+ s->change.fields ^= USERMOD_FIELD_LOGON_SCRIPT;
+ }
- } else if (s->change.fields & USERMOD_FIELD_PROFILE_PATH) {
- *level = 12;
- i->info12.profile_path.string = s->change.profile_path;
+ if ((s->change.fields & USERMOD_FIELD_PROFILE_PATH) &&
+ (*level == 0 || *level == 12)) {
+ *level = 12;
+ i->info12.profile_path.string = s->change.profile_path;
+
+ s->change.fields ^= USERMOD_FIELD_PROFILE_PATH;
+ }
- s->change.fields ^= USERMOD_FIELD_PROFILE_PATH;
+ if ((s->change.fields & USERMOD_FIELD_HOME_DIRECTORY) &&
+ (*level == 0 || *level == 10)) {
+ *level = 10;
+
+ if (queried) {
+ i->info10.home_directory.string = s->change.home_directory;
+ s->change.fields ^= USERMOD_FIELD_HOME_DIRECTORY;
+ } else {
+ return false;
+ }
+ }
- } else if (s->change.fields & USERMOD_FIELD_HOME_DIRECTORY) {
- *level = 3;
-
- if (s->stage == USERMOD_QUERY) {
- i->info3.home_directory.string = s->change.home_directory;
- s->change.fields ^= USERMOD_FIELD_HOME_DIRECTORY;
- } else {
- s->stage = USERMOD_QUERY;
- return s->change.fields;
- }
-
- } else if (s->change.fields & USERMOD_FIELD_HOME_DRIVE) {
- *level = 3;
-
- if (s->stage == USERMOD_QUERY) {
- i->info3.home_drive.string = s->change.home_drive;
- s->change.fields ^= USERMOD_FIELD_HOME_DRIVE;
- } else {
- s->stage = USERMOD_QUERY;
- return s->change.fields;
- }
-
- } else if (s->change.fields & USERMOD_FIELD_ACCT_EXPIRY) {
- *level = 17;
- i->info17.acct_expiry = timeval_to_nttime(s->change.acct_expiry);
-
- s->change.fields ^= USERMOD_FIELD_ACCT_EXPIRY;
-
- } else if (s->change.fields & USERMOD_FIELD_ACCT_FLAGS) {
- *level = 16;
- i->info16.acct_flags = s->change.acct_flags;
-
- s->change.fields ^= USERMOD_FIELD_ACCT_FLAGS;
+ if ((s->change.fields & USERMOD_FIELD_HOME_DRIVE) &&
+ (*level == 0 || *level == 10)) {
+ *level = 10;
+
+ if (queried) {
+ i->info10.home_drive.string = s->change.home_drive;
+ s->change.fields ^= USERMOD_FIELD_HOME_DRIVE;
+ } else {
+ return false;
}
}
+
+ if ((s->change.fields & USERMOD_FIELD_ACCT_EXPIRY) &&
+ (*level == 0 || *level == 17)) {
+ *level = 17;
+ i->info17.acct_expiry = timeval_to_nttime(s->change.acct_expiry);
+
+ s->change.fields ^= USERMOD_FIELD_ACCT_EXPIRY;
+ }
- /* We're going to be here back again soon unless all fields have been set */
- if (s->change.fields) {
- s->stage = USERMOD_OPEN;
- } else {
- s->stage = USERMOD_MODIFY;
+ if ((s->change.fields & USERMOD_FIELD_ACCT_FLAGS) &&
+ (*level == 0 || *level == 16)) {
+ *level = 16;
+ i->info16.acct_flags = s->change.acct_flags;
+
+ s->change.fields ^= USERMOD_FIELD_ACCT_FLAGS;
}
- return s->change.fields;
+ /* We're going to be here back again soon unless all fields have been set */
+ return true;
}
-/**
- * Stage 2: Open user account
- */
-static NTSTATUS usermod_open(struct composite_context *c,
- struct usermod_state *s)
+static NTSTATUS usermod_change(struct composite_context *c,
+ struct usermod_state *s)
{
+ bool do_set;
union samr_UserInfo *i = &s->info;
+ struct tevent_req *subreq;
+
/* set the level to invalid value, so that unless setfields routine
gives it a valid value we report the error correctly */
uint16_t level = 27;
- c->status = dcerpc_ndr_request_recv(s->req);
- NT_STATUS_NOT_OK_RETURN(c->status);
-
/* prepare UserInfo level and data based on bitmask field */
- s->change.fields = usermod_setfields(s, &level, i);
+ do_set = usermod_setfields(s, &level, i, false);
- if (level > 26) {
+ if (level < 1 || level > 26) {
/* apparently there's a field that the setfields routine
does not know how to set */
- c->state = COMPOSITE_STATE_ERROR;
return NT_STATUS_INVALID_PARAMETER;
}
first, right before changing the data. Otherwise we could set required
fields and accidentally reset the others.
*/
- if (s->stage == USERMOD_QUERY) {
+ if (!do_set) {
s->queryuser.in.user_handle = &s->user_handle;
s->queryuser.in.level = level;
+ s->queryuser.out.info = talloc(s, union samr_UserInfo *);
+ if (composite_nomem(s->queryuser.out.info, c)) return NT_STATUS_NO_MEMORY;
+
/* send query user info request to retrieve complete data of
a particular info level */
- s->req = dcerpc_samr_QueryUserInfo_send(s->pipe, c, &s->queryuser);
+ subreq = dcerpc_samr_QueryUserInfo_r_send(s, c->event_ctx,
+ s->pipe->binding_handle,
+ &s->queryuser);
+ if (composite_nomem(subreq, c)) return NT_STATUS_NO_MEMORY;
+ tevent_req_set_callback(subreq, continue_usermod_user_queried, c);
} else {
s->setuser.in.user_handle = &s->user_handle;
s->setuser.in.info = i;
/* send set user info request after making required change */
- s->req = dcerpc_samr_SetUserInfo_send(s->pipe, c, &s->setuser);
+ subreq = dcerpc_samr_SetUserInfo_r_send(s, c->event_ctx,
+ s->pipe->binding_handle,
+ &s->setuser);
+ if (composite_nomem(subreq, c)) return NT_STATUS_NO_MEMORY;
+ tevent_req_set_callback(subreq, continue_usermod_user_changed, c);
}
+
+ return NT_STATUS_OK;
+}
- /* callback handler setup */
- s->req->async.callback = usermod_handler;
- s->req->async.private = c;
- return NT_STATUS_OK;
+/**
+ * Stage 2: Open user account
+ */
+static void continue_usermod_user_opened(struct tevent_req *subreq)
+{
+ struct composite_context *c;
+ struct usermod_state *s;
+
+ c = tevent_req_callback_data(subreq, struct composite_context);
+ s = talloc_get_type(c->private_data, struct usermod_state);
+
+ c->status = dcerpc_samr_OpenUser_r_recv(subreq, s);
+ TALLOC_FREE(subreq);
+ if (!composite_is_ok(c)) return;
+
+ c->status = s->openuser.out.result;
+ if (!NT_STATUS_IS_OK(c->status)) {
+ composite_error(c, c->status);
+ return;
+ }
+
+ c->status = usermod_change(c, s);
}
/**
* Stage 2a (optional): Query the user information
*/
-static NTSTATUS usermod_query(struct composite_context *c,
- struct usermod_state *s)
+static void continue_usermod_user_queried(struct tevent_req *subreq)
{
- union samr_UserInfo *i = &s->info;
+ struct composite_context *c;
+ struct usermod_state *s;
+ union samr_UserInfo *i;
uint16_t level;
+
+ c = tevent_req_callback_data(subreq, struct composite_context);
+ s = talloc_get_type(c->private_data, struct usermod_state);
+
+ i = &s->info;
/* receive samr_QueryUserInfo result */
- c->status = dcerpc_ndr_request_recv(s->req);
- NT_STATUS_NOT_OK_RETURN(c->status);
+ c->status = dcerpc_samr_QueryUserInfo_r_recv(subreq, s);
+ TALLOC_FREE(subreq);
+ if (!composite_is_ok(c)) return;
+
+ c->status = s->queryuser.out.result;
+ if (!NT_STATUS_IS_OK(c->status)) {
+ composite_error(c, c->status);
+ return;
+ }
/* get returned user data and make a change (potentially one
of many) */
- s->info = *s->queryuser.out.info;
+ s->info = *(*s->queryuser.out.info);
- s->change.fields = usermod_setfields(s, &level, i);
+ usermod_setfields(s, &level, i, true);
/* prepare rpc call arguments */
s->setuser.in.user_handle = &s->user_handle;
s->setuser.in.info = i;
/* send the rpc request */
- s->req = dcerpc_samr_SetUserInfo_send(s->pipe, c, &s->setuser);
-
- /* callback handler setup */
- s->req->async.callback = usermod_handler;
- s->req->async.private = c;
-
- return NT_STATUS_OK;
+ subreq = dcerpc_samr_SetUserInfo_r_send(s, c->event_ctx,
+ s->pipe->binding_handle,
+ &s->setuser);
+ if (composite_nomem(subreq, c)) return;
+ tevent_req_set_callback(subreq, continue_usermod_user_changed, c);
}
/**
* Stage 3: Set new user account data
*/
-static NTSTATUS usermod_modify(struct composite_context *c,
- struct usermod_state *s)
-{
- /* receive samr_SetUserInfo result */
- c->status = dcerpc_ndr_request_recv(s->req);
- NT_STATUS_NOT_OK_RETURN(c->status);
-
- c->state = COMPOSITE_STATE_DONE;
-
- return NT_STATUS_OK;
-}
-
-
-/**
- * Event handler for asynchronous request. Handles transition through
- * intermediate stages of the call.
- *
- * @param req rpc call context
- */
-
-static void usermod_handler(struct rpc_request *req)
+static void continue_usermod_user_changed(struct tevent_req *subreq)
{
struct composite_context *c;
struct usermod_state *s;
- struct monitor_msg msg;
- struct msg_rpc_lookup_name *msg_lookup;
- struct msg_rpc_open_user *msg_open;
-
- c = talloc_get_type(req->async.private, struct composite_context);
+
+ c = tevent_req_callback_data(subreq, struct composite_context);
s = talloc_get_type(c->private_data, struct usermod_state);
- switch (s->stage) {
- case USERMOD_LOOKUP:
- c->status = usermod_lookup(c, s);
-
- if (NT_STATUS_IS_OK(c->status)) {
- /* monitor message */
- msg.type = rpc_lookup_name;
- msg_lookup = talloc(s, struct msg_rpc_lookup_name);
-
- msg_lookup->rid = s->lookupname.out.rids.ids;
- msg_lookup->count = s->lookupname.out.rids.count;
- msg.data = (void*)msg_lookup;
- msg.data_size = sizeof(*msg_lookup);
- }
- break;
-
- case USERMOD_OPEN:
- c->status = usermod_open(c, s);
-
- if (NT_STATUS_IS_OK(c->status)) {
- /* monitor message */
- msg.type = rpc_open_user;
- msg_open = talloc(s, struct msg_rpc_open_user);
-
- msg_open->rid = s->openuser.in.rid;
- msg_open->access_mask = s->openuser.in.rid;
- msg.data = (void*)msg_open;
- msg.data_size = sizeof(*msg_open);
- }
- break;
-
- case USERMOD_QUERY:
- c->status = usermod_query(c, s);
-
- if (NT_STATUS_IS_OK(c->status)) {
- /* monitor message */
- msg.type = rpc_query_user;
- msg.data = NULL;
- msg.data_size = 0;
- }
- break;
-
- case USERMOD_MODIFY:
- c->status = usermod_modify(c, s);
-
- if (NT_STATUS_IS_OK(c->status)) {
- /* monitor message */
- msg.type = rpc_set_user;
- msg.data = NULL;
- msg.data_size = 0;
- }
- break;
- }
+ /* receive samr_SetUserInfo result */
+ c->status = dcerpc_samr_SetUserInfo_r_recv(subreq, s);
+ TALLOC_FREE(subreq);
+ if (!composite_is_ok(c)) return;
- /* are we ok, so far ? */
+ /* return the actual function call status */
+ c->status = s->setuser.out.result;
if (!NT_STATUS_IS_OK(c->status)) {
- c->state = COMPOSITE_STATE_ERROR;
+ composite_error(c, c->status);
+ return;
}
- /* call monitor function provided the pointer has been passed */
- if (s->monitor_fn) {
- s->monitor_fn(&msg);
- }
+ if (s->change.fields == 0) {
+ /* all fields have been set - we're done */
+ composite_done(c);
- /* are we done yet ? */
- if (c->state >= COMPOSITE_STATE_DONE &&
- c->async.fn) {
- c->async.fn(c);
+ } else {
+ /* something's still not changed - repeat the procedure */
+ c->status = usermod_change(c, s);
}
}
{
struct composite_context *c;
struct usermod_state *s;
+ struct tevent_req *subreq;
/* composite context allocation and setup */
- c = talloc_zero(p, struct composite_context);
+ c = composite_create(p, dcerpc_event_context(p));
if (c == NULL) return NULL;
-
s = talloc_zero(c, struct usermod_state);
if (composite_nomem(s, c)) return c;
- c->state = COMPOSITE_STATE_IN_PROGRESS;
c->private_data = s;
- c->event_ctx = dcerpc_event_context(p);
/* store parameters in the call structure */
s->pipe = p;
s->lookupname.in.num_names = 1;
s->lookupname.in.names = talloc_zero(s, struct lsa_String);
s->lookupname.in.names->string = io->in.username;
+ s->lookupname.out.rids = talloc_zero(s, struct samr_Ids);
+ s->lookupname.out.types = talloc_zero(s, struct samr_Ids);
+ if (composite_nomem(s->lookupname.out.rids, c)) return c;
+ if (composite_nomem(s->lookupname.out.types, c)) return c;
/* send the rpc request */
- s->req = dcerpc_samr_LookupNames_send(p, c, &s->lookupname);
+ subreq = dcerpc_samr_LookupNames_r_send(s, c->event_ctx,
+ p->binding_handle,
+ &s->lookupname);
+ if (composite_nomem(subreq, c)) return c;
/* callback handler setup */
- s->req->async.callback = usermod_handler;
- s->req->async.private = c;
- s->stage = USERMOD_LOOKUP;
-
+ tevent_req_set_callback(subreq, continue_usermod_name_found, c);
return c;
}