s3-samr: let set_user_info_16 and 20 follow the same pattern as all other levels.
[ira/wip.git] / source3 / rpc_server / srv_samr_nt.c
index 0900a9bab4505819cbb458233dc7e198ef0c7131..e0ba51c68ac27e3d87263d40d88848e77d1ada68 100644 (file)
@@ -84,17 +84,6 @@ typedef struct disp_info {
                                                  * handler. */
 } DISP_INFO;
 
-/* We keep a static list of these by SID as modern clients close down
-   all resources between each request in a complete enumeration. */
-
-struct samr_info {
-       /* for use by the \PIPE\samr policy */
-       DOM_SID sid;
-       uint32 status; /* some sort of flag.  best to record it.  comes from opnum 0x39 */
-       uint32 acc_granted;
-       DISP_INFO *disp_info;
-};
-
 static const struct generic_mapping sam_generic_mapping = {
        GENERIC_RIGHTS_SAM_READ,
        GENERIC_RIGHTS_SAM_WRITE,
@@ -240,36 +229,6 @@ done:
        return status;
 }
 
-/*******************************************************************
- Checks if access to a function can be granted
-********************************************************************/
-
-static NTSTATUS access_check_samr_function(uint32 acc_granted, uint32 acc_required, const char *debug)
-{
-       DEBUG(5,("%s: access check ((granted: %#010x;  required: %#010x)\n",
-               debug, acc_granted, acc_required));
-
-       /* check the security descriptor first */
-
-       if ( (acc_granted&acc_required) == acc_required )
-               return NT_STATUS_OK;
-
-       /* give root a free pass */
-
-       if (geteuid() == sec_initial_uid()) {
-
-               DEBUG(4,("%s: ACCESS should be DENIED (granted: %#010x;  required: %#010x)\n",
-                       debug, acc_granted, acc_required));
-               DEBUGADD(4,("but overwritten by euid == 0\n"));
-
-               return NT_STATUS_OK;
-       }
-
-       DEBUG(2,("%s: ACCESS DENIED (granted: %#010x;  required: %#010x)\n",
-               debug, acc_granted, acc_required));
-
-       return NT_STATUS_ACCESS_DENIED;
-}
 
 /*******************************************************************
  Map any MAXIMUM_ALLOWED_ACCESS request to a valid access set.
@@ -386,37 +345,6 @@ static DISP_INFO *get_samr_dispinfo_by_sid(const struct dom_sid *psid)
        return NULL;
 }
 
-/*******************************************************************
- Create a samr_info struct.
-********************************************************************/
-
-static int samr_info_destructor(struct samr_info *info);
-
-static struct samr_info *get_samr_info_by_sid(TALLOC_CTX *mem_ctx,
-                                             DOM_SID *psid)
-{
-       struct samr_info *info;
-
-       info = talloc_zero(mem_ctx, struct samr_info);
-       if (info == NULL) {
-               return NULL;
-       }
-       talloc_set_destructor(info, samr_info_destructor);
-
-       DEBUG(10, ("get_samr_info_by_sid: created new info for sid %s\n",
-                  sid_string_dbg(psid)));
-
-       if (psid) {
-               sid_copy( &info->sid, psid);
-       } else {
-               DEBUG(10,("get_samr_info_by_sid: created new info for NULL sid.\n"));
-       }
-
-       info->disp_info = get_samr_dispinfo_by_sid(psid);
-
-       return info;
-}
-
 /*******************************************************************
  Function to free the per SID data.
  ********************************************************************/
@@ -440,17 +368,6 @@ static void free_samr_cache(DISP_INFO *disp_info)
        unbecome_root();
 }
 
-static int samr_info_destructor(struct samr_info *info)
-{
-       /* Only free the dispinfo cache if no one bothered to set up
-          a timeout. */
-
-       if (info->disp_info && info->disp_info->cache_timeout_event == NULL) {
-               free_samr_cache(info->disp_info);
-       }
-       return 0;
-}
-
 /*******************************************************************
  Idle event handler. Throw away the disp info cache.
  ********************************************************************/
@@ -723,31 +640,6 @@ NTSTATUS _samr_GetUserPwInfo(pipes_struct *p,
        return NT_STATUS_OK;
 }
 
-/*******************************************************************
-********************************************************************/
-
-static bool get_lsa_policy_samr_sid( pipes_struct *p, struct policy_handle *pol,
-                                       DOM_SID *sid, uint32 *acc_granted,
-                                       DISP_INFO **ppdisp_info)
-{
-       struct samr_info *info = NULL;
-
-       /* find the policy handle.  open a policy on it. */
-       if (!find_policy_by_hnd(p, pol, (void **)(void *)&info))
-               return False;
-
-       if (!info)
-               return False;
-
-       *sid = info->sid;
-       *acc_granted = info->acc_granted;
-       if (ppdisp_info) {
-               *ppdisp_info = info->disp_info;
-       }
-
-       return True;
-}
-
 /*******************************************************************
  _samr_SetSecurity
  ********************************************************************/
@@ -852,60 +744,99 @@ static bool check_change_pw_access(TALLOC_CTX *mem_ctx, DOM_SID *user_sid)
 NTSTATUS _samr_QuerySecurity(pipes_struct *p,
                             struct samr_QuerySecurity *r)
 {
+       struct samr_connect_info *cinfo;
+       struct samr_domain_info *dinfo;
+       struct samr_user_info *uinfo;
+       struct samr_group_info *ginfo;
+       struct samr_alias_info *ainfo;
        NTSTATUS status;
-       DOM_SID pol_sid;
        SEC_DESC * psd = NULL;
-       uint32 acc_granted;
        size_t sd_size;
 
-       /* Get the SID. */
-       if (!get_lsa_policy_samr_sid(p, r->in.handle, &pol_sid, &acc_granted, NULL))
-               return NT_STATUS_INVALID_HANDLE;
-
-       DEBUG(10,("_samr_QuerySecurity: querying security on SID: %s\n",
-                 sid_string_dbg(&pol_sid)));
-
-       status = access_check_samr_function(acc_granted,
-                                           STD_RIGHT_READ_CONTROL_ACCESS,
-                                           "_samr_QuerySecurity");
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
+       cinfo = policy_handle_find(p, r->in.handle,
+                                  STD_RIGHT_READ_CONTROL_ACCESS, NULL,
+                                  struct samr_connect_info, &status);
+       if (NT_STATUS_IS_OK(status)) {
+               DEBUG(5,("_samr_QuerySecurity: querying security on SAM\n"));
+               status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size,
+                                            &sam_generic_mapping, NULL, 0);
+               goto done;
        }
 
-       /* Check what typ of SID is beeing queried (e.g Domain SID, User SID, Group SID) */
-
-       /* To query the security of the SAM it self an invalid SID with S-0-0 is passed to this function */
-       if (pol_sid.sid_rev_num == 0) {
-               DEBUG(5,("_samr_QuerySecurity: querying security on SAM\n"));
-               status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &sam_generic_mapping, NULL, 0);
-       } else if (sid_equal(&pol_sid,get_global_sam_sid())) {
-               /* check if it is our domain SID */
+       dinfo = policy_handle_find(p, r->in.handle,
+                                  STD_RIGHT_READ_CONTROL_ACCESS, NULL,
+                                  struct samr_domain_info, &status);
+       if (NT_STATUS_IS_OK(status)) {
                DEBUG(5,("_samr_QuerySecurity: querying security on Domain "
-                        "with SID: %s\n", sid_string_dbg(&pol_sid)));
-               status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &dom_generic_mapping, NULL, 0);
-       } else if (sid_equal(&pol_sid,&global_sid_Builtin)) {
-               /* check if it is the Builtin  Domain */
-               /* TODO: Builtin probably needs a different SD with restricted write access*/
-               DEBUG(5,("_samr_QuerySecurity: querying security on Builtin "
-                        "Domain with SID: %s\n", sid_string_dbg(&pol_sid)));
-               status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &dom_generic_mapping, NULL, 0);
-       } else if (sid_check_is_in_our_domain(&pol_sid) ||
-                sid_check_is_in_builtin(&pol_sid)) {
-               /* TODO: different SDs have to be generated for aliases groups and users.
-                        Currently all three get a default user SD  */
-               DEBUG(10,("_samr_QuerySecurity: querying security on Object "
-                         "with SID: %s\n", sid_string_dbg(&pol_sid)));
-               if (check_change_pw_access(p->mem_ctx, &pol_sid)) {
-                       status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &usr_generic_mapping,
-                                                         &pol_sid, SAMR_USR_RIGHTS_WRITE_PW);
+                        "with SID: %s\n", sid_string_dbg(&dinfo->sid)));
+               /*
+                * TODO: Builtin probably needs a different SD with restricted
+                * write access
+                */
+               status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size,
+                                            &dom_generic_mapping, NULL, 0);
+               goto done;
+       }
+
+       uinfo = policy_handle_find(p, r->in.handle,
+                                  STD_RIGHT_READ_CONTROL_ACCESS, NULL,
+                                  struct samr_user_info, &status);
+       if (NT_STATUS_IS_OK(status)) {
+               DEBUG(10,("_samr_QuerySecurity: querying security on user "
+                         "Object with SID: %s\n",
+                         sid_string_dbg(&uinfo->sid)));
+               if (check_change_pw_access(p->mem_ctx, &uinfo->sid)) {
+                       status = make_samr_object_sd(
+                               p->mem_ctx, &psd, &sd_size,
+                               &usr_generic_mapping,
+                               &uinfo->sid, SAMR_USR_RIGHTS_WRITE_PW);
                } else {
-                       status = make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &usr_nopwchange_generic_mapping,
-                                                         &pol_sid, SAMR_USR_RIGHTS_CANT_WRITE_PW);
+                       status = make_samr_object_sd(
+                               p->mem_ctx, &psd, &sd_size,
+                               &usr_nopwchange_generic_mapping,
+                               &uinfo->sid, SAMR_USR_RIGHTS_CANT_WRITE_PW);
                }
-       } else {
-               return NT_STATUS_OBJECT_TYPE_MISMATCH;
+               goto done;
+       }
+
+       ginfo = policy_handle_find(p, r->in.handle,
+                                  STD_RIGHT_READ_CONTROL_ACCESS, NULL,
+                                  struct samr_group_info, &status);
+       if (NT_STATUS_IS_OK(status)) {
+               /*
+                * TODO: different SDs have to be generated for aliases groups
+                * and users.  Currently all three get a default user SD
+                */
+               DEBUG(10,("_samr_QuerySecurity: querying security on group "
+                         "Object with SID: %s\n",
+                         sid_string_dbg(&ginfo->sid)));
+               status = make_samr_object_sd(
+                       p->mem_ctx, &psd, &sd_size,
+                       &usr_nopwchange_generic_mapping,
+                       &ginfo->sid, SAMR_USR_RIGHTS_CANT_WRITE_PW);
+               goto done;
+       }
+
+       ainfo = policy_handle_find(p, r->in.handle,
+                                  STD_RIGHT_READ_CONTROL_ACCESS, NULL,
+                                  struct samr_alias_info, &status);
+       if (NT_STATUS_IS_OK(status)) {
+               /*
+                * TODO: different SDs have to be generated for aliases groups
+                * and users.  Currently all three get a default user SD
+                */
+               DEBUG(10,("_samr_QuerySecurity: querying security on alias "
+                         "Object with SID: %s\n",
+                         sid_string_dbg(&ainfo->sid)));
+               status = make_samr_object_sd(
+                       p->mem_ctx, &psd, &sd_size,
+                       &usr_nopwchange_generic_mapping,
+                       &ainfo->sid, SAMR_USR_RIGHTS_CANT_WRITE_PW);
+               goto done;
        }
 
+       return NT_STATUS_OBJECT_TYPE_MISMATCH;
+done:
        if ((*r->out.sdbuf = make_sec_desc_buf(p->mem_ctx, sd_size, psd)) == NULL)
                return NT_STATUS_NO_MEMORY;
 
@@ -2193,6 +2124,130 @@ static NTSTATUS init_samr_parameters_string(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
+/*************************************************************************
+ get_user_info_1.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_1(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo1 *r,
+                               struct samu *pw,
+                               DOM_SID *domain_sid)
+{
+       const DOM_SID *sid_group;
+       uint32_t primary_gid;
+
+       become_root();
+       sid_group = pdb_get_group_sid(pw);
+       unbecome_root();
+
+       if (!sid_peek_check_rid(domain_sid, sid_group, &primary_gid)) {
+               DEBUG(0, ("get_user_info_1: User %s has Primary Group SID %s, \n"
+                         "which conflicts with the domain sid %s.  Failing operation.\n",
+                         pdb_get_username(pw), sid_string_dbg(sid_group),
+                         sid_string_dbg(domain_sid)));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       r->account_name.string          = talloc_strdup(mem_ctx, pdb_get_username(pw));
+       r->full_name.string             = talloc_strdup(mem_ctx, pdb_get_fullname(pw));
+       r->primary_gid                  = primary_gid;
+       r->description.string           = talloc_strdup(mem_ctx, pdb_get_acct_desc(pw));
+       r->comment.string               = talloc_strdup(mem_ctx, pdb_get_comment(pw));
+
+       return NT_STATUS_OK;
+}
+
+/*************************************************************************
+ get_user_info_2.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_2(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo2 *r,
+                               struct samu *pw)
+{
+       r->comment.string               = talloc_strdup(mem_ctx, pdb_get_comment(pw));
+       r->unknown.string               = NULL;
+       r->country_code                 = 0;
+       r->code_page                    = 0;
+
+       return NT_STATUS_OK;
+}
+
+/*************************************************************************
+ get_user_info_3.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_3(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo3 *r,
+                               struct samu *pw,
+                               DOM_SID *domain_sid)
+{
+       const DOM_SID *sid_user, *sid_group;
+       uint32_t rid, primary_gid;
+
+       sid_user = pdb_get_user_sid(pw);
+
+       if (!sid_peek_check_rid(domain_sid, sid_user, &rid)) {
+               DEBUG(0, ("get_user_info_3: User %s has SID %s, \nwhich conflicts with "
+                         "the domain sid %s.  Failing operation.\n",
+                         pdb_get_username(pw), sid_string_dbg(sid_user),
+                         sid_string_dbg(domain_sid)));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       become_root();
+       sid_group = pdb_get_group_sid(pw);
+       unbecome_root();
+
+       if (!sid_peek_check_rid(domain_sid, sid_group, &primary_gid)) {
+               DEBUG(0, ("get_user_info_3: User %s has Primary Group SID %s, \n"
+                         "which conflicts with the domain sid %s.  Failing operation.\n",
+                         pdb_get_username(pw), sid_string_dbg(sid_group),
+                         sid_string_dbg(domain_sid)));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       unix_to_nt_time(&r->last_logon, pdb_get_logon_time(pw));
+       unix_to_nt_time(&r->last_logoff, pdb_get_logoff_time(pw));
+       unix_to_nt_time(&r->last_password_change, pdb_get_pass_last_set_time(pw));
+       unix_to_nt_time(&r->allow_password_change, pdb_get_pass_can_change_time(pw));
+       unix_to_nt_time(&r->force_password_change, pdb_get_pass_must_change_time(pw));
+
+       r->account_name.string  = talloc_strdup(mem_ctx, pdb_get_username(pw));
+       r->full_name.string     = talloc_strdup(mem_ctx, pdb_get_fullname(pw));
+       r->home_directory.string= talloc_strdup(mem_ctx, pdb_get_homedir(pw));
+       r->home_drive.string    = talloc_strdup(mem_ctx, pdb_get_dir_drive(pw));
+       r->logon_script.string  = talloc_strdup(mem_ctx, pdb_get_logon_script(pw));
+       r->profile_path.string  = talloc_strdup(mem_ctx, pdb_get_profile_path(pw));
+       r->workstations.string  = talloc_strdup(mem_ctx, pdb_get_workstations(pw));
+
+       r->logon_hours          = get_logon_hours_from_pdb(mem_ctx, pw);
+       r->rid                  = rid;
+       r->primary_gid          = primary_gid;
+       r->acct_flags           = pdb_get_acct_ctrl(pw);
+       r->bad_password_count   = pdb_get_bad_password_count(pw);
+       r->logon_count          = pdb_get_logon_count(pw);
+
+       return NT_STATUS_OK;
+}
+
+/*************************************************************************
+ get_user_info_4.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_4(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo4 *r,
+                               struct samu *pw)
+{
+       r->logon_hours          = get_logon_hours_from_pdb(mem_ctx, pw);
+
+       return NT_STATUS_OK;
+}
+
+/*************************************************************************
+ get_user_info_5.
+ *************************************************************************/
+
 static NTSTATUS get_user_info_5(TALLOC_CTX *mem_ctx,
                                struct samr_UserInfo5 *r,
                                struct samu *pw,
@@ -2247,6 +2302,20 @@ static NTSTATUS get_user_info_5(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
+/*************************************************************************
+ get_user_info_6.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_6(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo6 *r,
+                               struct samu *pw)
+{
+       r->account_name.string  = talloc_strdup(mem_ctx, pdb_get_username(pw));
+       r->full_name.string     = talloc_strdup(mem_ctx, pdb_get_fullname(pw));
+
+       return NT_STATUS_OK;
+}
+
 /*************************************************************************
  get_user_info_7. Safe. Only gives out account_name.
  *************************************************************************/
@@ -2263,6 +2332,19 @@ static NTSTATUS get_user_info_7(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
+/*************************************************************************
+ get_user_info_8.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_8(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo8 *r,
+                               struct samu *pw)
+{
+       r->full_name.string     = talloc_strdup(mem_ctx, pdb_get_fullname(pw));
+
+       return NT_STATUS_OK;
+}
+
 /*************************************************************************
  get_user_info_9. Only gives out primary group SID.
  *************************************************************************/
@@ -2276,6 +2358,72 @@ static NTSTATUS get_user_info_9(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
+/*************************************************************************
+ get_user_info_10.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_10(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo10 *r,
+                                struct samu *pw)
+{
+       r->home_directory.string= talloc_strdup(mem_ctx, pdb_get_homedir(pw));
+       r->home_drive.string    = talloc_strdup(mem_ctx, pdb_get_dir_drive(pw));
+
+       return NT_STATUS_OK;
+}
+
+/*************************************************************************
+ get_user_info_11.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_11(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo11 *r,
+                                struct samu *pw)
+{
+       r->logon_script.string  = talloc_strdup(mem_ctx, pdb_get_logon_script(pw));
+
+       return NT_STATUS_OK;
+}
+
+/*************************************************************************
+ get_user_info_12.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_12(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo12 *r,
+                                struct samu *pw)
+{
+       r->profile_path.string  = talloc_strdup(mem_ctx, pdb_get_profile_path(pw));
+
+       return NT_STATUS_OK;
+}
+
+/*************************************************************************
+ get_user_info_13.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_13(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo13 *r,
+                                struct samu *pw)
+{
+       r->description.string   = talloc_strdup(mem_ctx, pdb_get_acct_desc(pw));
+
+       return NT_STATUS_OK;
+}
+
+/*************************************************************************
+ get_user_info_14.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_14(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo14 *r,
+                                struct samu *pw)
+{
+       r->workstations.string  = talloc_strdup(mem_ctx, pdb_get_workstations(pw));
+
+       return NT_STATUS_OK;
+}
+
 /*************************************************************************
  get_user_info_16. Safe. Only gives out acb bits.
  *************************************************************************/
@@ -2289,6 +2437,19 @@ static NTSTATUS get_user_info_16(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
+/*************************************************************************
+ get_user_info_17.
+ *************************************************************************/
+
+static NTSTATUS get_user_info_17(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo17 *r,
+                                struct samu *pw)
+{
+       unix_to_nt_time(&r->acct_expiry, pdb_get_kickoff_time(pw));
+
+       return NT_STATUS_OK;
+}
+
 /*************************************************************************
  get_user_info_18. OK - this is the killer as it gives out password info.
  Ensure that this is only allowed on an encrypted connection with a root
@@ -2556,18 +2717,54 @@ NTSTATUS _samr_QueryUserInfo(pipes_struct *p,
        samr_clear_sam_passwd(pwd);
 
        switch (r->in.level) {
+       case 1:
+               status = get_user_info_1(p->mem_ctx, &user_info->info1, pwd, &domain_sid);
+               break;
+       case 2:
+               status = get_user_info_2(p->mem_ctx, &user_info->info2, pwd);
+               break;
+       case 3:
+               status = get_user_info_3(p->mem_ctx, &user_info->info3, pwd, &domain_sid);
+               break;
+       case 4:
+               status = get_user_info_4(p->mem_ctx, &user_info->info4, pwd);
+               break;
        case 5:
                status = get_user_info_5(p->mem_ctx, &user_info->info5, pwd, &domain_sid);
                break;
+       case 6:
+               status = get_user_info_6(p->mem_ctx, &user_info->info6, pwd);
+               break;
        case 7:
                status = get_user_info_7(p->mem_ctx, &user_info->info7, pwd);
                break;
+       case 8:
+               status = get_user_info_8(p->mem_ctx, &user_info->info8, pwd);
+               break;
        case 9:
                status = get_user_info_9(p->mem_ctx, &user_info->info9, pwd);
                break;
+       case 10:
+               status = get_user_info_10(p->mem_ctx, &user_info->info10, pwd);
+               break;
+       case 11:
+               status = get_user_info_11(p->mem_ctx, &user_info->info11, pwd);
+               break;
+       case 12:
+               status = get_user_info_12(p->mem_ctx, &user_info->info12, pwd);
+               break;
+       case 13:
+               status = get_user_info_13(p->mem_ctx, &user_info->info13, pwd);
+               break;
+       case 14:
+               status = get_user_info_14(p->mem_ctx, &user_info->info14, pwd);
+               break;
        case 16:
                status = get_user_info_16(p->mem_ctx, &user_info->info16, pwd);
                break;
+       case 17:
+               status = get_user_info_17(p->mem_ctx, &user_info->info17, pwd);
+               break;
        case 18:
                /* level 18 is special */
                status = get_user_info_18(p, p->mem_ctx, &user_info->info18,
@@ -3288,12 +3485,13 @@ NTSTATUS _samr_Connect5(pipes_struct *p,
        c.in.access_mask        = r->in.access_mask;
        c.out.connect_handle    = r->out.connect_handle;
 
+       *r->out.level_out = 1;
+
        status = _samr_Connect2(p, &c);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       *r->out.level_out = 1;
        r->out.info_out->info1 = info1;
 
        return NT_STATUS_OK;
@@ -3474,6 +3672,60 @@ NTSTATUS _samr_OpenAlias(pipes_struct *p,
        return NT_STATUS_OK;
 }
 
+/*******************************************************************
+ set_user_info_2
+ ********************************************************************/
+
+static NTSTATUS set_user_info_2(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo2 *id2,
+                               struct samu *pwd)
+{
+       if (id2 == NULL) {
+               DEBUG(5,("set_user_info_2: NULL id2\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       copy_id2_to_sam_passwd(pwd, id2);
+
+       return pdb_update_sam_account(pwd);
+}
+
+/*******************************************************************
+ set_user_info_4
+ ********************************************************************/
+
+static NTSTATUS set_user_info_4(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo4 *id4,
+                               struct samu *pwd)
+{
+       if (id4 == NULL) {
+               DEBUG(5,("set_user_info_2: NULL id4\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       copy_id4_to_sam_passwd(pwd, id4);
+
+       return pdb_update_sam_account(pwd);
+}
+
+/*******************************************************************
+ set_user_info_6
+ ********************************************************************/
+
+static NTSTATUS set_user_info_6(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo6 *id6,
+                               struct samu *pwd)
+{
+       if (id6 == NULL) {
+               DEBUG(5,("set_user_info_6: NULL id6\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       copy_id6_to_sam_passwd(pwd, id6);
+
+       return pdb_update_sam_account(pwd);
+}
+
 /*******************************************************************
  set_user_info_7
  ********************************************************************/
@@ -3513,28 +3765,148 @@ static NTSTATUS set_user_info_7(TALLOC_CTX *mem_ctx,
        return rc;
 }
 
+/*******************************************************************
+ set_user_info_8
+ ********************************************************************/
+
+static NTSTATUS set_user_info_8(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo8 *id8,
+                               struct samu *pwd)
+{
+       if (id8 == NULL) {
+               DEBUG(5,("set_user_info_8: NULL id8\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       copy_id8_to_sam_passwd(pwd, id8);
+
+       return pdb_update_sam_account(pwd);
+}
+
+/*******************************************************************
+ set_user_info_10
+ ********************************************************************/
+
+static NTSTATUS set_user_info_10(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo10 *id10,
+                                struct samu *pwd)
+{
+       if (id10 == NULL) {
+               DEBUG(5,("set_user_info_8: NULL id10\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       copy_id10_to_sam_passwd(pwd, id10);
+
+       return pdb_update_sam_account(pwd);
+}
+
+/*******************************************************************
+ set_user_info_11
+ ********************************************************************/
+
+static NTSTATUS set_user_info_11(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo11 *id11,
+                                struct samu *pwd)
+{
+       if (id11 == NULL) {
+               DEBUG(5,("set_user_info_11: NULL id11\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       copy_id11_to_sam_passwd(pwd, id11);
+
+       return pdb_update_sam_account(pwd);
+}
+
+/*******************************************************************
+ set_user_info_12
+ ********************************************************************/
+
+static NTSTATUS set_user_info_12(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo12 *id12,
+                                struct samu *pwd)
+{
+       if (id12 == NULL) {
+               DEBUG(5,("set_user_info_12: NULL id12\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       copy_id12_to_sam_passwd(pwd, id12);
+
+       return pdb_update_sam_account(pwd);
+}
+
+/*******************************************************************
+ set_user_info_13
+ ********************************************************************/
+
+static NTSTATUS set_user_info_13(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo13 *id13,
+                                struct samu *pwd)
+{
+       if (id13 == NULL) {
+               DEBUG(5,("set_user_info_13: NULL id13\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       copy_id13_to_sam_passwd(pwd, id13);
+
+       return pdb_update_sam_account(pwd);
+}
+
+/*******************************************************************
+ set_user_info_14
+ ********************************************************************/
+
+static NTSTATUS set_user_info_14(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo14 *id14,
+                                struct samu *pwd)
+{
+       if (id14 == NULL) {
+               DEBUG(5,("set_user_info_14: NULL id14\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       copy_id14_to_sam_passwd(pwd, id14);
+
+       return pdb_update_sam_account(pwd);
+}
+
 /*******************************************************************
  set_user_info_16
  ********************************************************************/
 
-static bool set_user_info_16(struct samr_UserInfo16 *id16,
-                            struct samu *pwd)
+static NTSTATUS set_user_info_16(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo16 *id16,
+                                struct samu *pwd)
 {
        if (id16 == NULL) {
-               DEBUG(5, ("set_user_info_16: NULL id16\n"));
-               return False;
+               DEBUG(5,("set_user_info_16: NULL id16\n"));
+               return NT_STATUS_ACCESS_DENIED;
        }
 
-       /* FIX ME: check if the value is really changed --metze */
-       if (!pdb_set_acct_ctrl(pwd, id16->acct_flags, PDB_CHANGED)) {
-               return False;
-       }
+       copy_id16_to_sam_passwd(pwd, id16);
 
-       if(!NT_STATUS_IS_OK(pdb_update_sam_account(pwd))) {
-               return False;
+       return pdb_update_sam_account(pwd);
+}
+
+/*******************************************************************
+ set_user_info_17
+ ********************************************************************/
+
+static NTSTATUS set_user_info_17(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo17 *id17,
+                                struct samu *pwd)
+{
+       if (id17 == NULL) {
+               DEBUG(5,("set_user_info_17: NULL id17\n"));
+               return NT_STATUS_ACCESS_DENIED;
        }
 
-       return True;
+       copy_id17_to_sam_passwd(pwd, id17);
+
+       return pdb_update_sam_account(pwd);
 }
 
 /*******************************************************************
@@ -3598,22 +3970,18 @@ static NTSTATUS set_user_info_18(struct samr_UserInfo18 *id18,
  set_user_info_20
  ********************************************************************/
 
-static bool set_user_info_20(struct samr_UserInfo20 *id20,
-                            struct samu *pwd)
+static NTSTATUS set_user_info_20(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo20 *id20,
+                                struct samu *pwd)
 {
        if (id20 == NULL) {
-               DEBUG(5, ("set_user_info_20: NULL id20\n"));
-               return False;
+               DEBUG(5,("set_user_info_20: NULL id20\n"));
+               return NT_STATUS_ACCESS_DENIED;
        }
 
        copy_id20_to_sam_passwd(pwd, id20);
 
-       /* write the change out */
-       if(!NT_STATUS_IS_OK(pdb_update_sam_account(pwd))) {
-               return False;
-       }
-
-       return True;
+       return pdb_update_sam_account(pwd);
 }
 
 /*******************************************************************
@@ -4113,15 +4481,64 @@ NTSTATUS _samr_SetUserInfo(pipes_struct *p,
 
        switch (switch_value) {
 
+               case 2:
+                       status = set_user_info_2(p->mem_ctx,
+                                                &info->info2, pwd);
+                       break;
+
+               case 4:
+                       status = set_user_info_4(p->mem_ctx,
+                                                &info->info4, pwd);
+                       break;
+
+               case 6:
+                       status = set_user_info_6(p->mem_ctx,
+                                                &info->info6, pwd);
+                       break;
+
                case 7:
                        status = set_user_info_7(p->mem_ctx,
                                                 &info->info7, pwd);
                        break;
 
+               case 8:
+                       status = set_user_info_8(p->mem_ctx,
+                                                &info->info8, pwd);
+                       break;
+
+               case 10:
+                       status = set_user_info_10(p->mem_ctx,
+                                                 &info->info10, pwd);
+                       break;
+
+               case 11:
+                       status = set_user_info_11(p->mem_ctx,
+                                                 &info->info11, pwd);
+                       break;
+
+               case 12:
+                       status = set_user_info_12(p->mem_ctx,
+                                                 &info->info12, pwd);
+                       break;
+
+               case 13:
+                       status = set_user_info_13(p->mem_ctx,
+                                                 &info->info13, pwd);
+                       break;
+
+               case 14:
+                       status = set_user_info_14(p->mem_ctx,
+                                                 &info->info14, pwd);
+                       break;
+
                case 16:
-                       if (!set_user_info_16(&info->info16, pwd)) {
-                               status = NT_STATUS_ACCESS_DENIED;
-                       }
+                       status = set_user_info_16(p->mem_ctx,
+                                                 &info->info16, pwd);
+                       break;
+
+               case 17:
+                       status = set_user_info_17(p->mem_ctx,
+                                                 &info->info17, pwd);
                        break;
 
                case 18:
@@ -4133,9 +4550,8 @@ NTSTATUS _samr_SetUserInfo(pipes_struct *p,
                        break;
 
                case 20:
-                       if (!set_user_info_20(&info->info20, pwd)) {
-                               status = NT_STATUS_ACCESS_DENIED;
-                       }
+                       status = set_user_info_20(p->mem_ctx,
+                                                 &info->info20, pwd);
                        break;
 
                case 21: