r23792: convert Samba4 to GPLv3
[samba.git] / source4 / libnet / userman.c
index 6bb0ad493920e9bfa9a259ea47c72d0798cf27d9..94448535cd081437e342288e2d71decbc5ee6c60 100644 (file)
@@ -5,7 +5,7 @@
    
    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,
@@ -14,8 +14,7 @@
    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/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
-#include "libcli/composite/monitor.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 #include "libnet/composite.h"
 #include "libnet/userman.h"
 #include "libnet/userinfo.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 /*
- * Composite user add function
+ * Composite USER ADD functionality
  */
 
 static void useradd_handler(struct rpc_request*);
@@ -47,6 +44,9 @@ struct useradd_state {
        struct samr_CreateUser   createuser;
        struct policy_handle     user_handle;
        uint32_t                 user_rid;
+
+       /* information about the progress */
+       void (*monitor_fn)(struct monitor_msg *);
 };
 
 
@@ -58,9 +58,12 @@ static NTSTATUS useradd_create(struct composite_context *c,
 {
        c->status = dcerpc_ndr_request_recv(s->req);
        NT_STATUS_NOT_OK_RETURN(c->status);
+
+       /* return the actual function call status */
+       c->status = s->createuser.out.result;
        
-       c->state = SMBCLI_REQUEST_DONE;
-       return NT_STATUS_OK;
+       c->state = COMPOSITE_STATE_DONE;
+       return c->status;
 }
 
 
@@ -72,15 +75,16 @@ static NTSTATUS useradd_create(struct composite_context *c,
  */
 static void useradd_handler(struct rpc_request *req)
 {
-       struct composite_context *c = req->async.private;
-       struct useradd_state *s = talloc_get_type(c->private, struct useradd_state);
+       struct composite_context *c = req->async.private_data;
+       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;
@@ -89,15 +93,18 @@ static void useradd_handler(struct rpc_request *req)
                break;
        }
 
+       /* are we ok so far ? */
        if (!NT_STATUS_IS_OK(c->status)) {
-               c->state = SMBCLI_REQUEST_ERROR;
+               c->state = COMPOSITE_STATE_ERROR;
        }
 
-       if (c->monitor_fn) {
-               c->monitor_fn(&msg);
+       /* call monitor function provided the pointer has been passed */
+       if (s->monitor_fn) {
+               s->monitor_fn(&msg);
        }
 
-       if (c->state >= SMBCLI_REQUEST_DONE &&
+       /* are we done yet ? */
+       if (c->state >= COMPOSITE_STATE_DONE &&
            c->async.fn) {
                c->async.fn(c);
        }
@@ -109,6 +116,7 @@ static void useradd_handler(struct rpc_request *req)
  *
  * @param p dce/rpc call pipe 
  * @param io arguments and results of the call
+ * @param monitor monitor function for providing information about the progress
  */
 
 struct composite_context *libnet_rpc_useradd_send(struct dcerpc_pipe *p,
@@ -117,41 +125,45 @@ struct composite_context *libnet_rpc_useradd_send(struct dcerpc_pipe *p,
 {
        struct composite_context *c;
        struct useradd_state *s;
-       
-       c = talloc_zero(p, struct composite_context);
-       if (c == NULL) goto failure;
+
+       if (!p || !io) return NULL;
+
+       /* composite allocation and setup */
+       c = composite_create(p, dcerpc_event_context(p));
+       if (c == NULL) return NULL;
        
        s = talloc_zero(c, struct useradd_state);
-       if (s == NULL) goto failure;
+       if (composite_nomem(s, c)) return c;
        
+       c->private_data = s;
+
+       /* put passed arguments to the state structure */
        s->domain_handle = io->in.domain_handle;
        s->pipe          = p;
+       s->monitor_fn    = monitor;
        
-       c->state       = SMBCLI_REQUEST_SEND;
-       c->private     = s;
-       c->event_ctx   = dcerpc_event_context(p);
-       c->monitor_fn  = monitor;
-
        /* 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 request */
+       /* send the request */
        s->req = dcerpc_samr_CreateUser_send(p, c, &s->createuser);
+       if (composite_nomem(s->req, c)) return c;
 
-       /* callback handler */
+       /* callback handler for continuation */
        s->req->async.callback = useradd_handler;
-       s->req->async.private  = c;
+       s->req->async.private_data  = c;
        s->stage = USERADD_CREATE;
 
        return c;
-       
-failure:
-       talloc_free(c);
-       return NULL;
 }
 
 
@@ -165,7 +177,7 @@ failure:
  */
 
 NTSTATUS libnet_rpc_useradd_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
-                                   struct libnet_rpc_useradd *io)
+                                struct libnet_rpc_useradd *io)
 {
        NTSTATUS status;
        struct useradd_state *s;
@@ -174,7 +186,7 @@ NTSTATUS libnet_rpc_useradd_recv(struct composite_context *c, TALLOC_CTX *mem_ct
        
        if (NT_STATUS_IS_OK(status) && io) {
                /* get and return result of the call */
-               s = talloc_get_type(c->private, struct useradd_state);
+               s = talloc_get_type(c->private_data, struct useradd_state);
                io->out.user_handle = s->user_handle;
        }
 
@@ -192,17 +204,18 @@ NTSTATUS libnet_rpc_useradd_recv(struct composite_context *c, TALLOC_CTX *mem_ct
  * @return nt status code of execution
  */
 
-NTSTATUS libnet_rpc_useradd(struct dcerpc_pipe *pipe,
-                              TALLOC_CTX *mem_ctx,
-                              struct libnet_rpc_useradd *io)
+NTSTATUS libnet_rpc_useradd(struct dcerpc_pipe *p,
+                           TALLOC_CTX *mem_ctx,
+                           struct libnet_rpc_useradd *io)
 {
-       struct composite_context *c = libnet_rpc_useradd_send(pipe, io, NULL);
+       struct composite_context *c = libnet_rpc_useradd_send(p, io, NULL);
        return libnet_rpc_useradd_recv(c, mem_ctx, io);
 }
 
 
+
 /*
- * Composite user delete function
+ * Composite USER DELETE functionality
  */
 
 static void userdel_handler(struct rpc_request*);
@@ -218,6 +231,9 @@ struct userdel_state {
        struct samr_LookupNames   lookupname;
        struct samr_OpenUser      openuser;
        struct samr_DeleteUser    deleteuser;
+
+       /* information about the progress */
+       void (*monitor_fn)(struct monitor_msg *);
 };
 
 
@@ -227,29 +243,39 @@ struct userdel_state {
 static NTSTATUS userdel_lookup(struct composite_context *c,
                               struct userdel_state *s)
 {
-       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-
+       /* receive samr_LookupNames result */
        c->status = dcerpc_ndr_request_recv(s->req);
+
+       /* check rpc layer status */
        NT_STATUS_NOT_OK_RETURN(c->status);
-       
+
+       /* check the call itself status */
+       NT_STATUS_NOT_OK_RETURN(s->lookupname.out.result);
+
+       /* 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) {
-               /* TODO: no such user */
-               status = NT_STATUS_NO_SUCH_USER;
+               c->status = NT_STATUS_NO_SUCH_USER;
+               composite_error(c, c->status);
 
        } else if (!s->lookupname.out.rids.count > 1) {
-               /* TODO: ambiguous username */
-               status = NT_STATUS_INVALID_ACCOUNT_NAME;
+               c->status = NT_STATUS_INVALID_ACCOUNT_NAME;
+               composite_error(c, c->status);
        }
-       
+
+       /* prepare the next rpc call arguments */
        s->openuser.in.domain_handle = &s->domain_handle;
        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;
+
+       /* callback handler setup */
        s->req->async.callback = userdel_handler;
-       s->req->async.private  = c;
+       s->req->async.private_data  = c;
        s->stage = USERDEL_OPEN;
        
        return NT_STATUS_OK;
@@ -262,16 +288,21 @@ static NTSTATUS userdel_lookup(struct composite_context *c,
 static NTSTATUS userdel_open(struct composite_context *c,
                             struct userdel_state *s)
 {
+       /* receive samr_OpenUser result */
        c->status = dcerpc_ndr_request_recv(s->req);
        NT_STATUS_NOT_OK_RETURN(c->status);
-       
+
+       /* 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;
+
+       /* callback handler setup */
        s->req->async.callback = userdel_handler;
-       s->req->async.private  = c;
+       s->req->async.private_data  = c;
        s->stage = USERDEL_DELETE;
        
        return NT_STATUS_OK;
@@ -284,12 +315,16 @@ static NTSTATUS userdel_open(struct composite_context *c,
 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 = SMBCLI_REQUEST_DONE;
+       /* return the actual function call status */
+       c->status = s->deleteuser.out.result;
 
-       return NT_STATUS_OK;
+       c->state = COMPOSITE_STATE_DONE;
+
+       return c->status;
 }
 
 
@@ -301,19 +336,24 @@ static NTSTATUS userdel_delete(struct composite_context *c,
  */
 static void userdel_handler(struct rpc_request *req)
 {
-       struct composite_context *c = req->async.private;
-       struct userdel_state *s = talloc_get_type(c->private, struct userdel_state);
+       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_data, 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->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);
@@ -322,9 +362,11 @@ static void userdel_handler(struct rpc_request *req)
        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->rid         = s->openuser.in.rid;
                msg_open->access_mask = s->openuser.in.rid;
                msg.data = (void*)msg_open;
                msg.data_size = sizeof(*msg_open);
@@ -333,21 +375,25 @@ static void userdel_handler(struct rpc_request *req)
        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 ? */
        if (!NT_STATUS_IS_OK(c->status)) {
-               c->state = SMBCLI_REQUEST_ERROR;
+               c->state = COMPOSITE_STATE_ERROR;
        }
 
-       if (c->monitor_fn) {
-               c->monitor_fn(&msg);
+       /* call monitor function provided the pointer has been passed */
+       if (s->monitor_fn) {
+               s->monitor_fn(&msg);
        }
 
-       if (c->state >= SMBCLI_REQUEST_DONE &&
+       /* are we done yet */
+       if (c->state >= COMPOSITE_STATE_DONE &&
            c->async.fn) {
                c->async.fn(c);
        }
@@ -359,26 +405,31 @@ static void userdel_handler(struct rpc_request *req)
  *
  * @param p dce/rpc call pipe
  * @param io arguments and results of the call
+ * @param monitor monitor function for providing information about the progress
  */
 
 struct composite_context *libnet_rpc_userdel_send(struct dcerpc_pipe *p,
-                                                 struct libnet_rpc_userdel *io)
+                                                 struct libnet_rpc_userdel *io,
+                                                 void (*monitor)(struct monitor_msg*))
 {
        struct composite_context *c;
        struct userdel_state *s;
-       
+
+       /* composite context allocation and setup */
        c = talloc_zero(p, struct composite_context);
-       if (c == NULL) goto failure;
+       if (c == NULL) return NULL;
 
        s = talloc_zero(c, struct userdel_state);
-       if (s == NULL) goto failure;
+       if (composite_nomem(s, c)) return c;
 
-       c->state      = SMBCLI_REQUEST_SEND;
-       c->private    = s;
-       c->event_ctx  = dcerpc_event_context(p);
+       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->domain_handle = io->in.domain_handle;
+       s->monitor_fn    = monitor;
        
        /* preparing parameters to send rpc request */
        s->lookupname.in.domain_handle = &io->in.domain_handle;
@@ -389,16 +440,12 @@ struct composite_context *libnet_rpc_userdel_send(struct dcerpc_pipe *p,
        /* send the request */
        s->req = dcerpc_samr_LookupNames_send(p, c, &s->lookupname);
 
-       /* callback handler */
+       /* callback handler setup */
        s->req->async.callback = userdel_handler;
-       s->req->async.private  = c;
+       s->req->async.private_data  = c;
        s->stage = USERDEL_LOOKUP;
 
        return c;
-
-failure:
-       talloc_free(c);
-       return NULL;
 }
 
 
@@ -420,7 +467,7 @@ NTSTATUS libnet_rpc_userdel_recv(struct composite_context *c, TALLOC_CTX *mem_ct
        status = composite_wait(c);
 
        if (NT_STATUS_IS_OK(status) && io) {
-               s  = talloc_get_type(c->private, struct userdel_state);
+               s  = talloc_get_type(c->private_data, struct userdel_state);
                io->out.user_handle = s->user_handle;
        }
 
@@ -438,30 +485,38 @@ NTSTATUS libnet_rpc_userdel_recv(struct composite_context *c, TALLOC_CTX *mem_ct
  * @return nt status code of execution
  */
 
-NTSTATUS libnet_rpc_userdel(struct dcerpc_pipe *pipe,
+NTSTATUS libnet_rpc_userdel(struct dcerpc_pipe *p,
                            TALLOC_CTX *mem_ctx,
                            struct libnet_rpc_userdel *io)
 {
-       struct composite_context *c = libnet_rpc_userdel_send(pipe, io);
+       struct composite_context *c = libnet_rpc_userdel_send(p, io, NULL);
        return libnet_rpc_userdel_recv(c, mem_ctx, io);
 }
 
 
+/*
+ * USER MODIFY functionality
+ */
+
 static void usermod_handler(struct rpc_request*);
 
-enum usermod_stage { USERMOD_LOOKUP, USERMOD_OPEN, USERMOD_MODIFY };
+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;
-       union  samr_UserInfo      info;
-       struct samr_LookupNames   lookupname;
-       struct samr_OpenUser      openuser;
-       struct samr_SetUserInfo   setuser;
+       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;
+       union  samr_UserInfo       info;
+       struct samr_LookupNames    lookupname;
+       struct samr_OpenUser       openuser;
+       struct samr_SetUserInfo    setuser;
+       struct samr_QueryUserInfo  queryuser;
+
+       /* information about the progress */
+       void (*monitor_fn)(struct monitor_msg *);
 };
 
 
@@ -471,29 +526,35 @@ struct usermod_state {
 static NTSTATUS usermod_lookup(struct composite_context *c,
                               struct usermod_state *s)
 {
-       NTSTATUS status;
-
+       /* receive samr_LookupNames result */
        c->status = dcerpc_ndr_request_recv(s->req);
        NT_STATUS_NOT_OK_RETURN(c->status);
 
+       /* 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) {
-               /* TODO: no such user */
-               status = NT_STATUS_NO_SUCH_USER;
+               c->status = NT_STATUS_NO_SUCH_USER;
+               c->state  = COMPOSITE_STATE_ERROR;
+               return c->status;
 
        } else if (!s->lookupname.out.rids.count > 1) {
-               /* TODO: ambiguous username */
-               status = NT_STATUS_INVALID_ACCOUNT_NAME;
+               c->status = NT_STATUS_INVALID_ACCOUNT_NAME;
+               c->state  = COMPOSITE_STATE_ERROR;
+               return c->status;
        }
 
+       /* 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.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);
 
+       /* callback handler setup */
        s->req->async.callback = usermod_handler;
-       s->req->async.private  = c;
+       s->req->async.private_data  = c;
        s->stage = USERMOD_OPEN;
        
        return NT_STATUS_OK;
@@ -501,74 +562,220 @@ static NTSTATUS usermod_lookup(struct composite_context *c,
 
 
 /**
- * Stage 2: Open user account
+ * Choose a proper level of samr_UserInfo structure depending on required
+ * change specified by means of flags field. Subsequent calls of this
+ * function are made until there's no flags set meaning that all of the
+ * changes have been made.
  */
-static NTSTATUS usermod_open(struct composite_context *c,
-                            struct usermod_state *s)
+static uint32_t usermod_setfields(struct usermod_state *s, uint16_t *level,
+                                 union samr_UserInfo *i)
 {
-       union samr_UserInfo *i = &s->info;
-       uint16_t level;
-
-       c->status = dcerpc_ndr_request_recv(s->req);
-       NT_STATUS_NOT_OK_RETURN(c->status);
-
-       s->setuser.in.user_handle  = &s->user_handle;
-
-       /* Prepare UserInfo level and data based on bitmask field */
-       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;
+       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 if (s->change.fields & USERMOD_FIELD_DESCRIPTION) {
-                       level = 13;
-                       i->info13.description.string = s->change.description;
-                       
-                       s->change.fields ^= USERMOD_FIELD_DESCRIPTION;
+       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_LOGON_SCRIPT) {
-                       level = 11;
-                       i->info11.logon_script.string = s->change.logon_script;
+       if ((s->change.fields & USERMOD_FIELD_COMMENT) &&
+           (*level == 0 || *level == 2)) {
+               *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;
                        
-                       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;
+               } else {
+                       /* we need to query the user info before setting one field in it */
+                       s->stage = USERMOD_QUERY;
+                       return s->change.fields;
+               }
+       }
 
-                       s->change.fields ^= USERMOD_FIELD_PROFILE_PATH;
+       if ((s->change.fields & USERMOD_FIELD_LOGON_SCRIPT) &&
+           (*level == 0 || *level == 11)) {
+               *level = 11;
+               i->info11.logon_script.string = s->change.logon_script;
+               
+               s->change.fields ^= USERMOD_FIELD_LOGON_SCRIPT;
+       }
 
-               } else if (s->change.fields & USERMOD_FIELD_ACCT_EXPIRY) {
-                       level = 17;
-                       i->info17.acct_expiry = timeval_to_nttime(s->change.acct_expiry);
+       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_ACCT_EXPIRY;
+       if ((s->change.fields & USERMOD_FIELD_HOME_DIRECTORY) &&
+           (*level == 0 || *level == 10)) {
+               *level = 10;
+               
+               if (s->stage == USERMOD_QUERY) {
+                       i->info10.home_directory.string = s->change.home_directory;
+                       s->change.fields ^= USERMOD_FIELD_HOME_DIRECTORY;
+               } else {
+                       s->stage = USERMOD_QUERY;
+                       return s->change.fields;
                }
        }
 
-       s->setuser.in.level  = level;
-       s->setuser.in.info   = i;
-
-       s->req = dcerpc_samr_SetUserInfo_send(s->pipe, c, &s->setuser);
+       if ((s->change.fields & USERMOD_FIELD_HOME_DRIVE) &&
+           (*level == 0 || *level == 10)) {
+               *level = 10;
+               
+               if (s->stage == USERMOD_QUERY) {
+                       i->info10.home_drive.string = s->change.home_drive;
+                       s->change.fields ^= USERMOD_FIELD_HOME_DRIVE;
+               } else {
+                       s->stage = USERMOD_QUERY;
+                       return s->change.fields;
+               }
+       }
+       
+       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;
+       }
 
-       s->req->async.callback = usermod_handler;
-       s->req->async.private  = c;
+       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;
+       }
 
-       /* Get back here again unless all fields have been set */
+       /* 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;
        }
 
+       return s->change.fields;
+}
+
+
+static NTSTATUS usermod_change(struct composite_context *c,
+                              struct usermod_state *s)
+{
+       union samr_UserInfo *i = &s->info;
+
+       /* 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;
+
+       /* prepare UserInfo level and data based on bitmask field */
+       s->change.fields = usermod_setfields(s, &level, i);
+
+       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;
+       }
+
+       /* If some specific level is used to set user account data and the change
+          itself does not cover all fields then we need to query the user info
+          first, right before changing the data. Otherwise we could set required
+          fields and accidentally reset the others.
+       */
+       if (s->stage == USERMOD_QUERY) {
+               s->queryuser.in.user_handle = &s->user_handle;
+               s->queryuser.in.level       = level;
+
+               /* 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);
+
+       } else {
+               s->setuser.in.user_handle  = &s->user_handle;
+               s->setuser.in.level        = level;
+               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);
+       }
+
+       /* callback handler setup */
+       s->req->async.callback = usermod_handler;
+       s->req->async.private_data  = c;
+
+       return NT_STATUS_OK;
+}
+
+
+/**
+ * Stage 2: Open user account
+ */
+static NTSTATUS usermod_open(struct composite_context *c,
+                            struct usermod_state *s)
+{
+       c->status = dcerpc_ndr_request_recv(s->req);
+       NT_STATUS_NOT_OK_RETURN(c->status);
+       
+       return usermod_change(c, s);
+}
+
+
+/**
+ * Stage 2a (optional): Query the user information
+ */
+static NTSTATUS usermod_query(struct composite_context *c,
+                             struct usermod_state *s)
+{
+       union samr_UserInfo *i = &s->info;
+       uint16_t level;
+
+       /* receive samr_QueryUserInfo result */
+       c->status = dcerpc_ndr_request_recv(s->req);
+       NT_STATUS_NOT_OK_RETURN(c->status);
+
+       /* get returned user data and make a change (potentially one
+          of many) */
+       s->info = *s->queryuser.out.info;
+
+       s->change.fields = usermod_setfields(s, &level, i);
+
+       /* prepare rpc call arguments */
+       s->setuser.in.user_handle  = &s->user_handle;
+       s->setuser.in.level        = level;
+       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_data  = c;
+
        return NT_STATUS_OK;
 }
 
@@ -579,12 +786,22 @@ static NTSTATUS usermod_open(struct composite_context *c,
 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 = SMBCLI_REQUEST_DONE;
+       /* return the actual function call status */
+       c->status = s->setuser.out.result;
 
-       return NT_STATUS_OK;
+       if (s->change.fields == 0) {
+               /* all fields have been set - we're done */
+               c->state = COMPOSITE_STATE_DONE;
+       } else {
+               /* something's still not changed - repeat the procedure */
+               return usermod_change(c, s);
+       }
+
+       return c->status;
 }
 
 
@@ -597,31 +814,81 @@ static NTSTATUS usermod_modify(struct composite_context *c,
 
 static void usermod_handler(struct rpc_request *req)
 {
-       struct composite_context *c = req->async.private;
-       struct usermod_state *s = talloc_get_type(c->private, struct usermod_state);
+       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_data, 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;
        }
 
+       /* are we ok, so far ? */
        if (!NT_STATUS_IS_OK(c->status)) {
-               c->state = SMBCLI_REQUEST_ERROR;
+               c->state = COMPOSITE_STATE_ERROR;
        }
 
-       if (c->monitor_fn) {
-               c->monitor_fn(&msg);
+       /* call monitor function provided the pointer has been passed */
+       if (s->monitor_fn) {
+               s->monitor_fn(&msg);
        }
 
-       if (c->state >= SMBCLI_REQUEST_DONE &&
+       /* are we done yet ? */
+       if (c->state >= COMPOSITE_STATE_DONE &&
            c->async.fn) {
                c->async.fn(c);
        }
@@ -633,44 +900,48 @@ static void usermod_handler(struct rpc_request *req)
  *
  * @param p dce/rpc call pipe
  * @param io arguments and results of the call
+ * @param monitor monitor function for providing information about the progress
  */
 
 struct composite_context *libnet_rpc_usermod_send(struct dcerpc_pipe *p,
-                                                 struct libnet_rpc_usermod *io)
+                                                 struct libnet_rpc_usermod *io,
+                                                 void (*monitor)(struct monitor_msg*))
 {
        struct composite_context *c;
        struct usermod_state *s;
-       
+
+       /* composite context allocation and setup */
        c = talloc_zero(p, struct composite_context);
-       if (c == NULL) goto failure;
+       if (c == NULL) return NULL;
 
        s = talloc_zero(c, struct usermod_state);
-       if (s == NULL) goto failure;
+       if (composite_nomem(s, c)) return c;
 
-       c->state      = SMBCLI_REQUEST_SEND;
-       c->private    = s;
-       c->event_ctx  = dcerpc_event_context(p);
+       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->domain_handle = io->in.domain_handle;
        s->change        = io->in.change;
+       s->monitor_fn    = monitor;
        
+       /* prepare rpc call arguments */
        s->lookupname.in.domain_handle = &io->in.domain_handle;
        s->lookupname.in.num_names     = 1;
        s->lookupname.in.names         = talloc_zero(s, struct lsa_String);
        s->lookupname.in.names->string = io->in.username;
-       
+
+       /* send the rpc request */
        s->req = dcerpc_samr_LookupNames_send(p, c, &s->lookupname);
        
+       /* callback handler setup */
        s->req->async.callback = usermod_handler;
-       s->req->async.private  = c;
+       s->req->async.private_data  = c;
        s->stage = USERMOD_LOOKUP;
 
        return c;
-
-failure:
-       talloc_free(c);
-       return NULL;
 }
 
 
@@ -687,7 +958,6 @@ NTSTATUS libnet_rpc_usermod_recv(struct composite_context *c, TALLOC_CTX *mem_ct
                                 struct libnet_rpc_usermod *io)
 {
        NTSTATUS status;
-       struct usermod_state *s;
        
        status = composite_wait(c);
 
@@ -705,10 +975,10 @@ NTSTATUS libnet_rpc_usermod_recv(struct composite_context *c, TALLOC_CTX *mem_ct
  * @return nt status code of execution
  */
 
-NTSTATUS libnet_rpc_usermod(struct dcerpc_pipe *pipe,
+NTSTATUS libnet_rpc_usermod(struct dcerpc_pipe *p,
                            TALLOC_CTX *mem_ctx,
                            struct libnet_rpc_usermod *io)
 {
-       struct composite_context *c = libnet_rpc_usermod_send(pipe, io);
+       struct composite_context *c = libnet_rpc_usermod_send(p, io, NULL);
        return libnet_rpc_usermod_recv(c, mem_ctx, io);
 }