Move MAX_SAM_ENTRIES defines to samr rpc_server and to samr.idl.
[samba.git] / source3 / rpc_server / srv_samr_nt.c
index 4c242dc323f304a17dbf44f2fe7f13cd77f53aca..8289440d6e98ab4f844284390bf9520126887996 100644 (file)
@@ -103,15 +103,6 @@ static const struct generic_mapping ali_generic_mapping = {
        GENERIC_RIGHTS_ALIAS_EXECUTE,
        GENERIC_RIGHTS_ALIAS_ALL_ACCESS};
 
-/*******************************************************************
- inits a structure.
-********************************************************************/
-
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
-       name->string = s;
-}
-
 /*******************************************************************
 *******************************************************************/
 
@@ -841,32 +832,29 @@ NTSTATUS _samr_QuerySecurity(pipes_struct *p,
 makes a SAM_ENTRY / UNISTR2* structure from a user list.
 ********************************************************************/
 
-static NTSTATUS make_user_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp,
-                                        UNISTR2 **uni_name_pp,
-                                        uint32 num_entries, uint32 start_idx,
+static NTSTATUS make_user_sam_entry_list(TALLOC_CTX *ctx,
+                                        struct samr_SamEntry **sam_pp,
+                                        uint32_t num_entries,
+                                        uint32_t start_idx,
                                         struct samr_displayentry *entries)
 {
-       uint32 i;
-       SAM_ENTRY *sam;
-       UNISTR2 *uni_name;
+       uint32_t i;
+       struct samr_SamEntry *sam;
 
        *sam_pp = NULL;
-       *uni_name_pp = NULL;
 
-       if (num_entries == 0)
+       if (num_entries == 0) {
                return NT_STATUS_OK;
+       }
 
-       sam = TALLOC_ZERO_ARRAY(ctx, SAM_ENTRY, num_entries);
-
-       uni_name = TALLOC_ZERO_ARRAY(ctx, UNISTR2, num_entries);
-
-       if (sam == NULL || uni_name == NULL) {
+       sam = TALLOC_ZERO_ARRAY(ctx, struct samr_SamEntry, num_entries);
+       if (sam == NULL) {
                DEBUG(0, ("make_user_sam_entry_list: TALLOC_ZERO failed!\n"));
                return NT_STATUS_NO_MEMORY;
        }
 
        for (i = 0; i < num_entries; i++) {
-               UNISTR2 uni_temp_name;
+#if 0
                /*
                 * usrmgr expects a non-NULL terminated string with
                 * trust relationships
@@ -878,50 +866,59 @@ static NTSTATUS make_user_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp,
                        init_unistr2(&uni_temp_name, entries[i].account_name,
                                     UNI_STR_TERMINATE);
                }
-
-               init_sam_entry(&sam[i], &uni_temp_name, entries[i].rid);
-               copy_unistr2(&uni_name[i], &uni_temp_name);
+#endif
+               init_lsa_String(&sam[i].name, entries[i].account_name);
+               sam[i].idx = entries[i].rid;
        }
 
        *sam_pp = sam;
-       *uni_name_pp = uni_name;
+
        return NT_STATUS_OK;
 }
 
+#define MAX_SAM_ENTRIES MAX_SAM_ENTRIES_W2K
+
 /*******************************************************************
samr_reply_enum_dom_users
_samr_EnumDomainUsers
  ********************************************************************/
 
-NTSTATUS _samr_enum_dom_users(pipes_struct *p, SAMR_Q_ENUM_DOM_USERS *q_u,
-                             SAMR_R_ENUM_DOM_USERS *r_u)
+NTSTATUS _samr_EnumDomainUsers(pipes_struct *p,
+                              struct samr_EnumDomainUsers *r)
 {
+       NTSTATUS status;
        struct samr_info *info = NULL;
        int num_account;
-       uint32 enum_context=q_u->start_idx;
+       uint32 enum_context = *r->in.resume_handle;
        enum remote_arch_types ra_type = get_remote_arch();
        int max_sam_entries = (ra_type == RA_WIN95) ? MAX_SAM_ENTRIES_W95 : MAX_SAM_ENTRIES_W2K;
        uint32 max_entries = max_sam_entries;
        struct samr_displayentry *entries = NULL;
-
-       r_u->status = NT_STATUS_OK;
+       struct samr_SamArray *samr_array = NULL;
+       struct samr_SamEntry *samr_entries = NULL;
 
        /* find the policy handle.  open a policy on it. */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)(void *)&info))
+       if (!find_policy_by_hnd(p, r->in.domain_handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(info->acc_granted,
-                                       SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
-                                       "_samr_enum_dom_users"))) {
-               return r_u->status;
+       status = access_check_samr_function(info->acc_granted,
+                                           SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
+                                           "_samr_EnumDomainUsers");
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       DEBUG(5,("_samr_enum_dom_users: %d\n", __LINE__));
+       DEBUG(5,("_samr_EnumDomainUsers: %d\n", __LINE__));
 
        if (info->builtin_domain) {
                /* No users in builtin. */
-               init_samr_r_enum_dom_users(r_u, q_u->start_idx, 0);
-               DEBUG(5,("_samr_enum_dom_users: No users in BUILTIN\n"));
-               return r_u->status;
+               *r->out.resume_handle = *r->in.resume_handle;
+               DEBUG(5,("_samr_EnumDomainUsers: No users in BUILTIN\n"));
+               return status;
+       }
+
+       samr_array = TALLOC_ZERO_P(p->mem_ctx, struct samr_SamArray);
+       if (!samr_array) {
+               return NT_STATUS_NO_MEMORY;
        }
 
        become_root();
@@ -929,14 +926,14 @@ NTSTATUS _samr_enum_dom_users(pipes_struct *p, SAMR_Q_ENUM_DOM_USERS *q_u,
        /* AS ROOT !!!! */
 
        if ((info->disp_info->enum_users != NULL) &&
-           (info->disp_info->enum_acb_mask != q_u->acb_mask)) {
+           (info->disp_info->enum_acb_mask != r->in.acct_flags)) {
                pdb_search_destroy(info->disp_info->enum_users);
                info->disp_info->enum_users = NULL;
        }
 
        if (info->disp_info->enum_users == NULL) {
-               info->disp_info->enum_users = pdb_search_users(q_u->acb_mask);
-               info->disp_info->enum_acb_mask = q_u->acb_mask;
+               info->disp_info->enum_users = pdb_search_users(r->in.acct_flags);
+               info->disp_info->enum_acb_mask = r->in.acct_flags;
        }
 
        if (info->disp_info->enum_users == NULL) {
@@ -954,63 +951,62 @@ NTSTATUS _samr_enum_dom_users(pipes_struct *p, SAMR_Q_ENUM_DOM_USERS *q_u,
        unbecome_root();
 
        if (num_account == 0) {
-               DEBUG(5, ("_samr_enum_dom_users: enumeration handle over "
+               DEBUG(5, ("_samr_EnumDomainUsers: enumeration handle over "
                          "total entries\n"));
-               init_samr_r_enum_dom_users(r_u, q_u->start_idx, 0);
+               *r->out.resume_handle = *r->in.resume_handle;
                return NT_STATUS_OK;
        }
 
-       r_u->status = make_user_sam_entry_list(p->mem_ctx, &r_u->sam,
-                                              &r_u->uni_acct_name,
-                                              num_account, enum_context,
-                                              entries);
-
-       if (!NT_STATUS_IS_OK(r_u->status))
-               return r_u->status;
+       status = make_user_sam_entry_list(p->mem_ctx, &samr_entries,
+                                         num_account, enum_context,
+                                         entries);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        if (max_entries <= num_account) {
-               r_u->status = STATUS_MORE_ENTRIES;
+               status = STATUS_MORE_ENTRIES;
        } else {
-               r_u->status = NT_STATUS_OK;
+               status = NT_STATUS_OK;
        }
 
        /* Ensure we cache this enumeration. */
        set_disp_info_cache_timeout(info->disp_info, DISP_INFO_CACHE_TIMEOUT);
 
-       DEBUG(5, ("_samr_enum_dom_users: %d\n", __LINE__));
+       DEBUG(5, ("_samr_EnumDomainUsers: %d\n", __LINE__));
 
-       init_samr_r_enum_dom_users(r_u, q_u->start_idx + num_account,
-                                  num_account);
+       samr_array->count = num_account;
+       samr_array->entries = samr_entries;
 
-       DEBUG(5,("_samr_enum_dom_users: %d\n", __LINE__));
+       *r->out.resume_handle = *r->in.resume_handle + num_account;
+       *r->out.sam = samr_array;
+       *r->out.num_entries = num_account;
 
-       return r_u->status;
+       DEBUG(5,("_samr_EnumDomainUsers: %d\n", __LINE__));
+
+       return status;
 }
 
 /*******************************************************************
 makes a SAM_ENTRY / UNISTR2* structure from a group list.
 ********************************************************************/
 
-static void make_group_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp,
-                                     UNISTR2 **uni_name_pp,
-                                     uint32 num_sam_entries,
+static void make_group_sam_entry_list(TALLOC_CTX *ctx,
+                                     struct samr_SamEntry **sam_pp,
+                                     uint32_t num_sam_entries,
                                      struct samr_displayentry *entries)
 {
-       uint32 i;
-       SAM_ENTRY *sam;
-       UNISTR2 *uni_name;
+       struct samr_SamEntry *sam;
+       uint32_t i;
 
        *sam_pp = NULL;
-       *uni_name_pp = NULL;
 
-       if (num_sam_entries == 0)
+       if (num_sam_entries == 0) {
                return;
+       }
 
-       sam = TALLOC_ZERO_ARRAY(ctx, SAM_ENTRY, num_sam_entries);
-       uni_name = TALLOC_ZERO_ARRAY(ctx, UNISTR2, num_sam_entries);
-
-       if (sam == NULL || uni_name == NULL) {
-               DEBUG(0, ("NULL pointers in SAMR_R_QUERY_DISPINFO\n"));
+       sam = TALLOC_ZERO_ARRAY(ctx, struct samr_SamEntry, num_sam_entries);
+       if (sam == NULL) {
                return;
        }
 
@@ -1018,44 +1014,50 @@ static void make_group_sam_entry_list(TALLOC_CTX *ctx, SAM_ENTRY **sam_pp,
                /*
                 * JRA. I think this should include the null. TNG does not.
                 */
-               init_unistr2(&uni_name[i], entries[i].account_name,
-                            UNI_STR_TERMINATE);
-               init_sam_entry(&sam[i], &uni_name[i], entries[i].rid);
+               init_lsa_String(&sam[i].name, entries[i].account_name);
+               sam[i].idx = entries[i].rid;
        }
 
        *sam_pp = sam;
-       *uni_name_pp = uni_name;
 }
 
 /*******************************************************************
samr_reply_enum_dom_groups
_samr_EnumDomainGroups
  ********************************************************************/
 
-NTSTATUS _samr_enum_dom_groups(pipes_struct *p, SAMR_Q_ENUM_DOM_GROUPS *q_u, SAMR_R_ENUM_DOM_GROUPS *r_u)
+NTSTATUS _samr_EnumDomainGroups(pipes_struct *p,
+                               struct samr_EnumDomainGroups *r)
 {
+       NTSTATUS status;
        struct samr_info *info = NULL;
        struct samr_displayentry *groups;
        uint32 num_groups;
-
-       r_u->status = NT_STATUS_OK;
+       struct samr_SamArray *samr_array = NULL;
+       struct samr_SamEntry *samr_entries = NULL;
 
        /* find the policy handle.  open a policy on it. */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)(void *)&info))
+       if (!find_policy_by_hnd(p, r->in.domain_handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       r_u->status = access_check_samr_function(info->acc_granted,
-                                                SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
-                                                "_samr_enum_dom_groups");
-       if (!NT_STATUS_IS_OK(r_u->status))
-               return r_u->status;
+       status = access_check_samr_function(info->acc_granted,
+                                           SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
+                                           "_samr_EnumDomainGroups");
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-       DEBUG(5,("samr_reply_enum_dom_groups: %d\n", __LINE__));
+       DEBUG(5,("_samr_EnumDomainGroups: %d\n", __LINE__));
 
        if (info->builtin_domain) {
                /* No groups in builtin. */
-               init_samr_r_enum_dom_groups(r_u, q_u->start_idx, 0);
-               DEBUG(5,("_samr_enum_dom_users: No groups in BUILTIN\n"));
-               return r_u->status;
+               *r->out.resume_handle = *r->in.resume_handle;
+               DEBUG(5,("_samr_EnumDomainGroups: No groups in BUILTIN\n"));
+               return status;
+       }
+
+       samr_array = TALLOC_ZERO_P(p->mem_ctx, struct samr_SamArray);
+       if (!samr_array) {
+               return NT_STATUS_NO_MEMORY;
        }
 
        /* the domain group array is being allocated in the function below */
@@ -1071,46 +1073,64 @@ NTSTATUS _samr_enum_dom_groups(pipes_struct *p, SAMR_Q_ENUM_DOM_GROUPS *q_u, SAM
                }
        }
 
-       num_groups = pdb_search_entries(info->disp_info->groups, q_u->start_idx,
+       num_groups = pdb_search_entries(info->disp_info->groups,
+                                       *r->in.resume_handle,
                                        MAX_SAM_ENTRIES, &groups);
        unbecome_root();
 
        /* Ensure we cache this enumeration. */
        set_disp_info_cache_timeout(info->disp_info, DISP_INFO_CACHE_TIMEOUT);
 
-       make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name,
+       make_group_sam_entry_list(p->mem_ctx, &samr_entries,
                                  num_groups, groups);
 
-       init_samr_r_enum_dom_groups(r_u, q_u->start_idx, num_groups);
+       samr_array->count = num_groups;
+       samr_array->entries = samr_entries;
+
+       *r->out.sam = samr_array;
+       *r->out.num_entries = num_groups;
+       /* this was missing, IMHO:
+       *r->out.resume_handle = num_groups + *r->in.resume_handle;
+       */
 
-       DEBUG(5,("samr_enum_dom_groups: %d\n", __LINE__));
+       DEBUG(5,("_samr_EnumDomainGroups: %d\n", __LINE__));
 
-       return r_u->status;
+       return status;
 }
 
 /*******************************************************************
samr_reply_enum_dom_aliases
_samr_EnumDomainAliases
  ********************************************************************/
 
-NTSTATUS _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, SAMR_R_ENUM_DOM_ALIASES *r_u)
+NTSTATUS _samr_EnumDomainAliases(pipes_struct *p,
+                                struct samr_EnumDomainAliases *r)
 {
+       NTSTATUS status;
        struct samr_info *info;
        struct samr_displayentry *aliases;
        uint32 num_aliases = 0;
+       struct samr_SamArray *samr_array = NULL;
+       struct samr_SamEntry *samr_entries = NULL;
 
        /* find the policy handle.  open a policy on it. */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)(void *)&info))
+       if (!find_policy_by_hnd(p, r->in.domain_handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       r_u->status = access_check_samr_function(info->acc_granted,
-                                                SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
-                                                "_samr_enum_dom_aliases");
-       if (!NT_STATUS_IS_OK(r_u->status))
-               return r_u->status;
+       status = access_check_samr_function(info->acc_granted,
+                                           SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
+                                           "_samr_EnumDomainAliases");
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-       DEBUG(5,("samr_reply_enum_dom_aliases: sid %s\n",
+       DEBUG(5,("_samr_EnumDomainAliases: sid %s\n",
                 sid_string_dbg(&info->sid)));
 
+       samr_array = TALLOC_ZERO_P(p->mem_ctx, struct samr_SamArray);
+       if (!samr_array) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
        become_root();
 
        if (info->disp_info->aliases == NULL) {
@@ -1121,22 +1141,225 @@ NTSTATUS _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, S
                }
        }
 
-       num_aliases = pdb_search_entries(info->disp_info->aliases, q_u->start_idx,
+       num_aliases = pdb_search_entries(info->disp_info->aliases,
+                                        *r->in.resume_handle,
                                         MAX_SAM_ENTRIES, &aliases);
        unbecome_root();
 
        /* Ensure we cache this enumeration. */
        set_disp_info_cache_timeout(info->disp_info, DISP_INFO_CACHE_TIMEOUT);
 
-       make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name,
+       make_group_sam_entry_list(p->mem_ctx, &samr_entries,
                                  num_aliases, aliases);
 
-       init_samr_r_enum_dom_aliases(r_u, q_u->start_idx + num_aliases,
-                                    num_aliases);
+       DEBUG(5,("_samr_EnumDomainAliases: %d\n", __LINE__));
+
+       samr_array->count = num_aliases;
+       samr_array->entries = samr_entries;
+
+       *r->out.sam = samr_array;
+       *r->out.num_entries = num_aliases;
+       *r->out.resume_handle = num_aliases + *r->in.resume_handle;
+
+       return status;
+}
+
+/*******************************************************************
+ inits a samr_DispInfoGeneral structure.
+********************************************************************/
+
+static NTSTATUS init_samr_dispinfo_1(TALLOC_CTX *ctx,
+                                    struct samr_DispInfoGeneral *r,
+                                    uint32_t num_entries,
+                                    uint32_t start_idx,
+                                    struct samr_displayentry *entries)
+{
+       uint32 i;
+
+       DEBUG(10, ("init_samr_dispinfo_1: num_entries: %d\n", num_entries));
+
+       if (num_entries == 0) {
+               return NT_STATUS_OK;
+       }
+
+       r->count = num_entries;
+
+       r->entries = TALLOC_ZERO_ARRAY(ctx, struct samr_DispEntryGeneral, num_entries);
+       if (!r->entries) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       for (i = 0; i < num_entries ; i++) {
+
+               init_lsa_String(&r->entries[i].account_name,
+                               entries[i].account_name);
+
+               init_lsa_String(&r->entries[i].description,
+                               entries[i].description);
+
+               init_lsa_String(&r->entries[i].full_name,
+                               entries[i].fullname);
+
+               r->entries[i].rid = entries[i].rid;
+               r->entries[i].acct_flags = entries[i].acct_flags;
+               r->entries[i].idx = start_idx+i+1;
+       }
+
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ inits a samr_DispInfoFull structure.
+********************************************************************/
+
+static NTSTATUS init_samr_dispinfo_2(TALLOC_CTX *ctx,
+                                    struct samr_DispInfoFull *r,
+                                    uint32_t num_entries,
+                                    uint32_t start_idx,
+                                    struct samr_displayentry *entries)
+{
+       uint32_t i;
+
+       DEBUG(10, ("init_samr_dispinfo_2: num_entries: %d\n", num_entries));
+
+       if (num_entries == 0) {
+               return NT_STATUS_OK;
+       }
+
+       r->count = num_entries;
+
+       r->entries = TALLOC_ZERO_ARRAY(ctx, struct samr_DispEntryFull, num_entries);
+       if (!r->entries) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       for (i = 0; i < num_entries ; i++) {
+
+               init_lsa_String(&r->entries[i].account_name,
+                               entries[i].account_name);
+
+               init_lsa_String(&r->entries[i].description,
+                               entries[i].description);
+
+               r->entries[i].rid = entries[i].rid;
+               r->entries[i].acct_flags = entries[i].acct_flags;
+               r->entries[i].idx = start_idx+i+1;
+       }
+
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ inits a samr_DispInfoFullGroups structure.
+********************************************************************/
+
+static NTSTATUS init_samr_dispinfo_3(TALLOC_CTX *ctx,
+                                    struct samr_DispInfoFullGroups *r,
+                                    uint32_t num_entries,
+                                    uint32_t start_idx,
+                                    struct samr_displayentry *entries)
+{
+       uint32_t i;
+
+       DEBUG(5, ("init_samr_dispinfo_3: num_entries: %d\n", num_entries));
+
+       if (num_entries == 0) {
+               return NT_STATUS_OK;
+       }
+
+       r->count = num_entries;
+
+       r->entries = TALLOC_ZERO_ARRAY(ctx, struct samr_DispEntryFullGroup, num_entries);
+       if (!r->entries) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       for (i = 0; i < num_entries ; i++) {
+
+               init_lsa_String(&r->entries[i].account_name,
+                               entries[i].account_name);
+
+               init_lsa_String(&r->entries[i].description,
+                               entries[i].description);
+
+               r->entries[i].rid = entries[i].rid;
+               r->entries[i].acct_flags = entries[i].acct_flags;
+               r->entries[i].idx = start_idx+i+1;
+       }
+
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ inits a samr_DispInfoAscii structure.
+********************************************************************/
+
+static NTSTATUS init_samr_dispinfo_4(TALLOC_CTX *ctx,
+                                    struct samr_DispInfoAscii *r,
+                                    uint32_t num_entries,
+                                    uint32_t start_idx,
+                                    struct samr_displayentry *entries)
+{
+       uint32_t i;
+
+       DEBUG(5, ("init_samr_dispinfo_4: num_entries: %d\n", num_entries));
+
+       if (num_entries == 0) {
+               return NT_STATUS_OK;
+       }
+
+       r->count = num_entries;
+
+       r->entries = TALLOC_ZERO_ARRAY(ctx, struct samr_DispEntryAscii, num_entries);
+       if (!r->entries) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       for (i = 0; i < num_entries ; i++) {
+
+               init_lsa_AsciiString(&r->entries[i].account_name,
+                                    entries[i].account_name);
+
+               r->entries[i].idx = start_idx+i+1;
+       }
+
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ inits a samr_DispInfoAscii structure.
+********************************************************************/
+
+static NTSTATUS init_samr_dispinfo_5(TALLOC_CTX *ctx,
+                                    struct samr_DispInfoAscii *r,
+                                    uint32_t num_entries,
+                                    uint32_t start_idx,
+                                    struct samr_displayentry *entries)
+{
+       uint32_t i;
+
+       DEBUG(5, ("init_samr_dispinfo_5: num_entries: %d\n", num_entries));
+
+       if (num_entries == 0) {
+               return NT_STATUS_OK;
+       }
 
-       DEBUG(5,("samr_enum_dom_aliases: %d\n", __LINE__));
+       r->count = num_entries;
 
-       return r_u->status;
+       r->entries = TALLOC_ZERO_ARRAY(ctx, struct samr_DispEntryAscii, num_entries);
+       if (!r->entries) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       for (i = 0; i < num_entries ; i++) {
+
+               init_lsa_AsciiString(&r->entries[i].account_name,
+                                    entries[i].account_name);
+
+               r->entries[i].idx = start_idx+i+1;
+       }
+
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
@@ -1295,29 +1518,29 @@ NTSTATUS _samr_QueryDisplayInfo(pipes_struct *p,
        /* Now create reply structure */
        switch (r->in.level) {
        case 0x1:
-               disp_ret = init_sam_dispinfo_1(p->mem_ctx, &disp_info->info1,
-                                              num_account, enum_context,
-                                              entries);
+               disp_ret = init_samr_dispinfo_1(p->mem_ctx, &disp_info->info1,
+                                               num_account, enum_context,
+                                               entries);
                break;
        case 0x2:
-               disp_ret = init_sam_dispinfo_2(p->mem_ctx, &disp_info->info2,
-                                              num_account, enum_context,
-                                              entries);
+               disp_ret = init_samr_dispinfo_2(p->mem_ctx, &disp_info->info2,
+                                               num_account, enum_context,
+                                               entries);
                break;
        case 0x3:
-               disp_ret = init_sam_dispinfo_3(p->mem_ctx, &disp_info->info3,
-                                              num_account, enum_context,
-                                              entries);
+               disp_ret = init_samr_dispinfo_3(p->mem_ctx, &disp_info->info3,
+                                               num_account, enum_context,
+                                               entries);
                break;
        case 0x4:
-               disp_ret = init_sam_dispinfo_4(p->mem_ctx, &disp_info->info4,
-                                              num_account, enum_context,
-                                              entries);
+               disp_ret = init_samr_dispinfo_4(p->mem_ctx, &disp_info->info4,
+                                               num_account, enum_context,
+                                               entries);
                break;
        case 0x5:
-               disp_ret = init_sam_dispinfo_5(p->mem_ctx, &disp_info->info5,
-                                              num_account, enum_context,
-                                              entries);
+               disp_ret = init_samr_dispinfo_5(p->mem_ctx, &disp_info->info5,
+                                               num_account, enum_context,
+                                               entries);
                break;
        default:
                smb_panic("info class changed");
@@ -1347,6 +1570,50 @@ NTSTATUS _samr_QueryDisplayInfo(pipes_struct *p,
        return status;
 }
 
+/****************************************************************
+ _samr_QueryDisplayInfo2
+****************************************************************/
+
+NTSTATUS _samr_QueryDisplayInfo2(pipes_struct *p,
+                                struct samr_QueryDisplayInfo2 *r)
+{
+       struct samr_QueryDisplayInfo q;
+
+       q.in.domain_handle      = r->in.domain_handle;
+       q.in.level              = r->in.level;
+       q.in.start_idx          = r->in.start_idx;
+       q.in.max_entries        = r->in.max_entries;
+       q.in.buf_size           = r->in.buf_size;
+
+       q.out.total_size        = r->out.total_size;
+       q.out.returned_size     = r->out.returned_size;
+       q.out.info              = r->out.info;
+
+       return _samr_QueryDisplayInfo(p, &q);
+}
+
+/****************************************************************
+ _samr_QueryDisplayInfo3
+****************************************************************/
+
+NTSTATUS _samr_QueryDisplayInfo3(pipes_struct *p,
+                                struct samr_QueryDisplayInfo3 *r)
+{
+       struct samr_QueryDisplayInfo q;
+
+       q.in.domain_handle      = r->in.domain_handle;
+       q.in.level              = r->in.level;
+       q.in.start_idx          = r->in.start_idx;
+       q.in.max_entries        = r->in.max_entries;
+       q.in.buf_size           = r->in.buf_size;
+
+       q.out.total_size        = r->out.total_size;
+       q.out.returned_size     = r->out.returned_size;
+       q.out.info              = r->out.info;
+
+       return _samr_QueryDisplayInfo(p, &q);
+}
+
 /*******************************************************************
  _samr_QueryAliasInfo
  ********************************************************************/
@@ -1890,10 +2157,15 @@ NTSTATUS _samr_OpenUser(pipes_struct *p,
  get_user_info_7. Safe. Only gives out account_name.
  *************************************************************************/
 
-static NTSTATUS get_user_info_7(TALLOC_CTX *mem_ctx, SAM_USER_INFO_7 *id7, DOM_SID *user_sid)
+static NTSTATUS get_user_info_7(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo7 *r,
+                               DOM_SID *user_sid)
 {
        struct samu *smbpass=NULL;
        bool ret;
+       const char *account_name = NULL;
+
+       ZERO_STRUCTP(r);
 
        if ( !(smbpass = samu_new( mem_ctx )) ) {
                return NT_STATUS_NO_MEMORY;
@@ -1908,12 +2180,16 @@ static NTSTATUS get_user_info_7(TALLOC_CTX *mem_ctx, SAM_USER_INFO_7 *id7, DOM_S
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       DEBUG(3,("User:[%s]\n", pdb_get_username(smbpass) ));
+       account_name = talloc_strdup(mem_ctx, pdb_get_username(smbpass));
+       if (!account_name) {
+               TALLOC_FREE(smbpass);
+               return NT_STATUS_NO_MEMORY;
+       }
+       TALLOC_FREE(smbpass);
 
-       ZERO_STRUCTP(id7);
-       init_sam_user_info7(id7, pdb_get_username(smbpass) );
+       DEBUG(3,("User:[%s]\n", account_name));
 
-       TALLOC_FREE(smbpass);
+       init_samr_user_info7(r, account_name);
 
        return NT_STATUS_OK;
 }
@@ -1921,11 +2197,16 @@ static NTSTATUS get_user_info_7(TALLOC_CTX *mem_ctx, SAM_USER_INFO_7 *id7, DOM_S
 /*************************************************************************
  get_user_info_9. Only gives out primary group SID.
  *************************************************************************/
-static NTSTATUS get_user_info_9(TALLOC_CTX *mem_ctx, SAM_USER_INFO_9 * id9, DOM_SID *user_sid)
+
+static NTSTATUS get_user_info_9(TALLOC_CTX *mem_ctx,
+                               struct samr_UserInfo9 *r,
+                               DOM_SID *user_sid)
 {
        struct samu *smbpass=NULL;
        bool ret;
 
+       ZERO_STRUCTP(r);
+
        if ( !(smbpass = samu_new( mem_ctx )) ) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1936,13 +2217,13 @@ static NTSTATUS get_user_info_9(TALLOC_CTX *mem_ctx, SAM_USER_INFO_9 * id9, DOM_
 
        if (ret==False) {
                DEBUG(4,("User %s not found\n", sid_string_dbg(user_sid)));
+               TALLOC_FREE(smbpass);
                return NT_STATUS_NO_SUCH_USER;
        }
 
        DEBUG(3,("User:[%s]\n", pdb_get_username(smbpass) ));
 
-       ZERO_STRUCTP(id9);
-       init_sam_user_info9(id9, pdb_get_group_rid(smbpass) );
+       init_samr_user_info9(r, pdb_get_group_rid(smbpass));
 
        TALLOC_FREE(smbpass);
 
@@ -1953,11 +2234,15 @@ static NTSTATUS get_user_info_9(TALLOC_CTX *mem_ctx, SAM_USER_INFO_9 * id9, DOM_
  get_user_info_16. Safe. Only gives out acb bits.
  *************************************************************************/
 
-static NTSTATUS get_user_info_16(TALLOC_CTX *mem_ctx, SAM_USER_INFO_16 *id16, DOM_SID *user_sid)
+static NTSTATUS get_user_info_16(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo16 *r,
+                                DOM_SID *user_sid)
 {
        struct samu *smbpass=NULL;
        bool ret;
 
+       ZERO_STRUCTP(r);
+
        if ( !(smbpass = samu_new( mem_ctx )) ) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1968,13 +2253,13 @@ static NTSTATUS get_user_info_16(TALLOC_CTX *mem_ctx, SAM_USER_INFO_16 *id16, DO
 
        if (ret==False) {
                DEBUG(4,("User %s not found\n", sid_string_dbg(user_sid)));
+               TALLOC_FREE(smbpass);
                return NT_STATUS_NO_SUCH_USER;
        }
 
        DEBUG(3,("User:[%s]\n", pdb_get_username(smbpass) ));
 
-       ZERO_STRUCTP(id16);
-       init_sam_user_info16(id16, pdb_get_acct_ctrl(smbpass) );
+       init_samr_user_info16(r, pdb_get_acct_ctrl(smbpass));
 
        TALLOC_FREE(smbpass);
 
@@ -1987,11 +2272,16 @@ static NTSTATUS get_user_info_16(TALLOC_CTX *mem_ctx, SAM_USER_INFO_16 *id16, DO
  user. JRA.
  *************************************************************************/
 
-static NTSTATUS get_user_info_18(pipes_struct *p, TALLOC_CTX *mem_ctx, SAM_USER_INFO_18 * id18, DOM_SID *user_sid)
+static NTSTATUS get_user_info_18(pipes_struct *p,
+                                TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo18 *r,
+                                DOM_SID *user_sid)
 {
        struct samu *smbpass=NULL;
        bool ret;
 
+       ZERO_STRUCTP(r);
+
        if (p->auth.auth_type != PIPE_AUTH_TYPE_NTLMSSP || p->auth.auth_type != PIPE_AUTH_TYPE_SPNEGO_NTLMSSP) {
                return NT_STATUS_ACCESS_DENIED;
        }
@@ -2023,8 +2313,8 @@ static NTSTATUS get_user_info_18(pipes_struct *p, TALLOC_CTX *mem_ctx, SAM_USER_
                return NT_STATUS_ACCOUNT_DISABLED;
        }
 
-       ZERO_STRUCTP(id18);
-       init_sam_user_info18(id18, pdb_get_lanman_passwd(smbpass), pdb_get_nt_passwd(smbpass));
+       init_samr_user_info18(r, pdb_get_lanman_passwd(smbpass),
+                             pdb_get_nt_passwd(smbpass));
 
        TALLOC_FREE(smbpass);
 
@@ -2035,10 +2325,17 @@ static NTSTATUS get_user_info_18(pipes_struct *p, TALLOC_CTX *mem_ctx, SAM_USER_
  get_user_info_20
  *************************************************************************/
 
-static NTSTATUS get_user_info_20(TALLOC_CTX *mem_ctx, SAM_USER_INFO_20 *id20, DOM_SID *user_sid)
+static NTSTATUS get_user_info_20(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo20 *r,
+                                DOM_SID *user_sid)
 {
        struct samu *sampass=NULL;
        bool ret;
+       const char *munged_dial = NULL;
+       const char *munged_dial_decoded = NULL;
+       DATA_BLOB blob;
+
+       ZERO_STRUCTP(r);
 
        if ( !(sampass = samu_new( mem_ctx )) ) {
                return NT_STATUS_NO_MEMORY;
@@ -2050,72 +2347,221 @@ static NTSTATUS get_user_info_20(TALLOC_CTX *mem_ctx, SAM_USER_INFO_20 *id20, DO
 
        if (ret == False) {
                DEBUG(4,("User %s not found\n", sid_string_dbg(user_sid)));
+               TALLOC_FREE(sampass);
                return NT_STATUS_NO_SUCH_USER;
        }
 
+       munged_dial = pdb_get_munged_dial(sampass);
+
        samr_clear_sam_passwd(sampass);
 
        DEBUG(3,("User:[%s]\n",  pdb_get_username(sampass) ));
 
-       ZERO_STRUCTP(id20);
-       init_sam_user_info20A(id20, sampass);
+       if (munged_dial) {
+               blob = base64_decode_data_blob(munged_dial);
+               munged_dial_decoded = talloc_strndup(mem_ctx,
+                                                    (const char *)blob.data,
+                                                    blob.length);
+               data_blob_free(&blob);
+               if (!munged_dial_decoded) {
+                       TALLOC_FREE(sampass);
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
+
+#if 0
+       init_unistr2_from_datablob(&usr->uni_munged_dial, &blob);
+       init_uni_hdr(&usr->hdr_munged_dial, &usr->uni_munged_dial);
+       data_blob_free(&blob);
+#endif
+       init_samr_user_info20(r, munged_dial_decoded);
 
        TALLOC_FREE(sampass);
 
        return NT_STATUS_OK;
 }
 
+
 /*************************************************************************
  get_user_info_21
  *************************************************************************/
 
-static NTSTATUS get_user_info_21(TALLOC_CTX *mem_ctx, SAM_USER_INFO_21 *id21,
-                                DOM_SID *user_sid, DOM_SID *domain_sid)
+static NTSTATUS get_user_info_21(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo21 *r,
+                                DOM_SID *user_sid,
+                                DOM_SID *domain_sid)
 {
-       struct samu *sampass=NULL;
+       struct samu *pw = NULL;
        bool ret;
-       NTSTATUS nt_status;
-
-       if ( !(sampass = samu_new( mem_ctx )) ) {
+       const DOM_SID *sid_user, *sid_group;
+       uint32_t rid, primary_gid;
+       NTTIME last_logon, last_logoff, last_password_change,
+              acct_expiry, allow_password_change, force_password_change;
+       time_t must_change_time;
+       uint8_t password_expired;
+       const char *account_name, *full_name, *home_directory, *home_drive,
+                  *logon_script, *profile_path, *description,
+                  *workstations, *comment, *parameters;
+       struct samr_LogonHours logon_hours;
+       const char *munged_dial = NULL;
+       DATA_BLOB blob;
+
+       ZERO_STRUCTP(r);
+
+       if (!(pw = samu_new(mem_ctx))) {
                return NT_STATUS_NO_MEMORY;
        }
 
        become_root();
-       ret = pdb_getsampwsid(sampass, user_sid);
+       ret = pdb_getsampwsid(pw, user_sid);
        unbecome_root();
 
        if (ret == False) {
                DEBUG(4,("User %s not found\n", sid_string_dbg(user_sid)));
+               TALLOC_FREE(pw);
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       samr_clear_sam_passwd(sampass);
+       samr_clear_sam_passwd(pw);
 
-       DEBUG(3,("User:[%s]\n",  pdb_get_username(sampass) ));
+       DEBUG(3,("User:[%s]\n", pdb_get_username(pw)));
 
-       ZERO_STRUCTP(id21);
-       nt_status = init_sam_user_info21A(id21, sampass, domain_sid);
+       sid_user = pdb_get_user_sid(pw);
 
-       TALLOC_FREE(sampass);
+       if (!sid_peek_check_rid(domain_sid, sid_user, &rid)) {
+               DEBUG(0, ("get_user_info_21: 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)));
+               TALLOC_FREE(pw);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
 
-       return nt_status;
+       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_21: 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)));
+               TALLOC_FREE(pw);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       unix_to_nt_time(&last_logon, pdb_get_logon_time(pw));
+       unix_to_nt_time(&last_logoff, pdb_get_logoff_time(pw));
+       unix_to_nt_time(&acct_expiry, pdb_get_kickoff_time(pw));
+       unix_to_nt_time(&last_password_change, pdb_get_pass_last_set_time(pw));
+       unix_to_nt_time(&allow_password_change, pdb_get_pass_can_change_time(pw));
+
+       must_change_time = pdb_get_pass_must_change_time(pw);
+       if (must_change_time == get_time_t_max()) {
+               unix_to_nt_time_abs(&force_password_change, must_change_time);
+       } else {
+               unix_to_nt_time(&force_password_change, must_change_time);
+       }
+
+       if (pdb_get_pass_must_change_time(pw) == 0) {
+               password_expired = PASS_MUST_CHANGE_AT_NEXT_LOGON;
+       } else {
+               password_expired = 0;
+       }
+
+       munged_dial = pdb_get_munged_dial(pw);
+       if (munged_dial) {
+               blob = base64_decode_data_blob(munged_dial);
+               parameters = talloc_strndup(mem_ctx, (const char *)blob.data, blob.length);
+               data_blob_free(&blob);
+               if (!parameters) {
+                       TALLOC_FREE(pw);
+                       return NT_STATUS_NO_MEMORY;
+               }
+       } else {
+               parameters = NULL;
+       }
+
+
+       account_name = talloc_strdup(mem_ctx, pdb_get_username(pw));
+       full_name = talloc_strdup(mem_ctx, pdb_get_fullname(pw));
+       home_directory = talloc_strdup(mem_ctx, pdb_get_homedir(pw));
+       home_drive = talloc_strdup(mem_ctx, pdb_get_dir_drive(pw));
+       logon_script = talloc_strdup(mem_ctx, pdb_get_logon_script(pw));
+       profile_path = talloc_strdup(mem_ctx, pdb_get_profile_path(pw));
+       description = talloc_strdup(mem_ctx, pdb_get_acct_desc(pw));
+       workstations = talloc_strdup(mem_ctx, pdb_get_workstations(pw));
+       comment = talloc_strdup(mem_ctx, pdb_get_comment(pw));
+
+       logon_hours = get_logon_hours_from_pdb(mem_ctx, pw);
+#if 0
+
+       /*
+         Look at a user on a real NT4 PDC with usrmgr, press
+         'ok'. Then you will see that fields_present is set to
+         0x08f827fa. Look at the user immediately after that again,
+         and you will see that 0x00fffff is returned. This solves
+         the problem that you get access denied after having looked
+         at the user.
+         -- Volker
+       */
+
+#if 0
+       init_unistr2_from_datablob(&usr->uni_munged_dial, &munged_dial_blob);
+       init_uni_hdr(&usr->hdr_munged_dial, &usr->uni_munged_dial);
+       data_blob_free(&munged_dial_blob);
+#endif
+#endif
+
+       init_samr_user_info21(r,
+                             last_logon,
+                             last_logoff,
+                             last_password_change,
+                             acct_expiry,
+                             allow_password_change,
+                             force_password_change,
+                             account_name,
+                             full_name,
+                             home_directory,
+                             home_drive,
+                             logon_script,
+                             profile_path,
+                             description,
+                             workstations,
+                             comment,
+                             parameters,
+                             rid,
+                             primary_gid,
+                             pdb_get_acct_ctrl(pw),
+                             pdb_build_fields_present(pw),
+                             logon_hours,
+                             pdb_get_bad_password_count(pw),
+                             pdb_get_logon_count(pw),
+                             0, /* country_code */
+                             0, /* code_page */
+                             0, /* nt_password_set */
+                             0, /* lm_password_set */
+                             password_expired);
+       TALLOC_FREE(pw);
+
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
- _samr_query_userinfo
+ _samr_QueryUserInfo
  ********************************************************************/
 
-NTSTATUS _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_R_QUERY_USERINFO *r_u)
+NTSTATUS _samr_QueryUserInfo(pipes_struct *p,
+                            struct samr_QueryUserInfo *r)
 {
-       SAM_USERINFO_CTR *ctr;
+       NTSTATUS status;
+       union samr_UserInfo *user_info = NULL;
        struct samr_info *info = NULL;
        DOM_SID domain_sid;
        uint32 rid;
 
-       r_u->status=NT_STATUS_OK;
-
        /* search for the handle */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)(void *)&info))
+       if (!find_policy_by_hnd(p, r->in.user_handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
        domain_sid = info->sid;
@@ -2125,81 +2571,67 @@ NTSTATUS _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_
        if (!sid_check_is_in_our_domain(&info->sid))
                return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-       DEBUG(5,("_samr_query_userinfo: sid:%s\n",
+       DEBUG(5,("_samr_QueryUserInfo: sid:%s\n",
                 sid_string_dbg(&info->sid)));
 
-       ctr = TALLOC_ZERO_P(p->mem_ctx, SAM_USERINFO_CTR);
-       if (!ctr)
+       user_info = TALLOC_ZERO_P(p->mem_ctx, union samr_UserInfo);
+       if (!user_info) {
                return NT_STATUS_NO_MEMORY;
+       }
 
-       ZERO_STRUCTP(ctr);
-
-       /* ok!  user info levels (lots: see MSDEV help), off we go... */
-       ctr->switch_value = q_u->switch_value;
-
-       DEBUG(5,("_samr_query_userinfo: user info level: %d\n", q_u->switch_value));
+       DEBUG(5,("_samr_QueryUserInfo: user info level: %d\n", r->in.level));
 
-       switch (q_u->switch_value) {
+       switch (r->in.level) {
        case 7:
-               ctr->info.id7 = TALLOC_ZERO_P(p->mem_ctx, SAM_USER_INFO_7);
-               if (ctr->info.id7 == NULL)
-                       return NT_STATUS_NO_MEMORY;
-
-               if (!NT_STATUS_IS_OK(r_u->status = get_user_info_7(p->mem_ctx, ctr->info.id7, &info->sid)))
-                       return r_u->status;
+               status = get_user_info_7(p->mem_ctx, &user_info->info7, &info->sid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
                break;
        case 9:
-               ctr->info.id9 = TALLOC_ZERO_P(p->mem_ctx, SAM_USER_INFO_9);
-               if (ctr->info.id9 == NULL)
-                       return NT_STATUS_NO_MEMORY;
-
-               if (!NT_STATUS_IS_OK(r_u->status = get_user_info_9(p->mem_ctx, ctr->info.id9, &info->sid)))
-                       return r_u->status;
+               status = get_user_info_9(p->mem_ctx, &user_info->info9, &info->sid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
                break;
        case 16:
-               ctr->info.id16 = TALLOC_ZERO_P(p->mem_ctx, SAM_USER_INFO_16);
-               if (ctr->info.id16 == NULL)
-                       return NT_STATUS_NO_MEMORY;
-
-               if (!NT_STATUS_IS_OK(r_u->status = get_user_info_16(p->mem_ctx, ctr->info.id16, &info->sid)))
-                       return r_u->status;
+               status = get_user_info_16(p->mem_ctx, &user_info->info16, &info->sid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
                break;
 
        case 18:
-               ctr->info.id18 = TALLOC_ZERO_P(p->mem_ctx, SAM_USER_INFO_18);
-               if (ctr->info.id18 == NULL)
-                       return NT_STATUS_NO_MEMORY;
-
-               if (!NT_STATUS_IS_OK(r_u->status = get_user_info_18(p, p->mem_ctx, ctr->info.id18, &info->sid)))
-                       return r_u->status;
+               status = get_user_info_18(p, p->mem_ctx, &user_info->info18, &info->sid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
                break;
 
        case 20:
-               ctr->info.id20 = TALLOC_ZERO_P(p->mem_ctx,SAM_USER_INFO_20);
-               if (ctr->info.id20 == NULL)
-                       return NT_STATUS_NO_MEMORY;
-               if (!NT_STATUS_IS_OK(r_u->status = get_user_info_20(p->mem_ctx, ctr->info.id20, &info->sid)))
-                       return r_u->status;
+               status = get_user_info_20(p->mem_ctx, &user_info->info20, &info->sid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
                break;
 
        case 21:
-               ctr->info.id21 = TALLOC_ZERO_P(p->mem_ctx,SAM_USER_INFO_21);
-               if (ctr->info.id21 == NULL)
-                       return NT_STATUS_NO_MEMORY;
-               if (!NT_STATUS_IS_OK(r_u->status = get_user_info_21(p->mem_ctx, ctr->info.id21,
-                                                                   &info->sid, &domain_sid)))
-                       return r_u->status;
+               status = get_user_info_21(p->mem_ctx, &user_info->info21,
+                                         &info->sid, &domain_sid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
                break;
 
        default:
                return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       init_samr_r_query_userinfo(r_u, ctr, r_u->status);
+       *r->out.info = user_info;
 
-       DEBUG(5,("_samr_query_userinfo: %d\n", __LINE__));
+       DEBUG(5,("_samr_QueryUserInfo: %d\n", __LINE__));
 
-       return r_u->status;
+       return status;
 }
 
 /*******************************************************************
@@ -2980,87 +3412,67 @@ NTSTATUS _samr_LookupDomain(pipes_struct *p,
        if (strequal(domain_name, builtin_domain_name())) {
                sid_copy(sid, &global_sid_Builtin);
        } else {
-               if (!secrets_fetch_domain_sid(domain_name, sid)) {
-                       status = NT_STATUS_NO_SUCH_DOMAIN;
-               }
-       }
-
-       DEBUG(2,("Returning domain sid for domain %s -> %s\n", domain_name,
-                sid_string_dbg(sid)));
-
-       *r->out.sid = sid;
-
-       return status;
-}
-
-/******************************************************************
-makes a SAMR_R_ENUM_DOMAINS structure.
-********************************************************************/
-
-static bool make_enum_domains(TALLOC_CTX *ctx, SAM_ENTRY **pp_sam,
-                       UNISTR2 **pp_uni_name, uint32 num_sam_entries, fstring doms[])
-{
-       uint32 i;
-       SAM_ENTRY *sam;
-       UNISTR2 *uni_name;
-
-       DEBUG(5, ("make_enum_domains\n"));
-
-       *pp_sam = NULL;
-       *pp_uni_name = NULL;
-
-       if (num_sam_entries == 0)
-               return True;
-
-       sam = TALLOC_ZERO_ARRAY(ctx, SAM_ENTRY, num_sam_entries);
-       uni_name = TALLOC_ZERO_ARRAY(ctx, UNISTR2, num_sam_entries);
-
-       if (sam == NULL || uni_name == NULL)
-               return False;
-
-       for (i = 0; i < num_sam_entries; i++) {
-               init_unistr2(&uni_name[i], doms[i], UNI_FLAGS_NONE);
-               init_sam_entry(&sam[i], &uni_name[i], 0);
+               if (!secrets_fetch_domain_sid(domain_name, sid)) {
+                       status = NT_STATUS_NO_SUCH_DOMAIN;
+               }
        }
 
-       *pp_sam = sam;
-       *pp_uni_name = uni_name;
+       DEBUG(2,("Returning domain sid for domain %s -> %s\n", domain_name,
+                sid_string_dbg(sid)));
+
+       *r->out.sid = sid;
 
-       return True;
+       return status;
 }
 
 /**********************************************************************
api_samr_enum_domains
_samr_EnumDomains
  **********************************************************************/
 
-NTSTATUS _samr_enum_domains(pipes_struct *p, SAMR_Q_ENUM_DOMAINS *q_u, SAMR_R_ENUM_DOMAINS *r_u)
+NTSTATUS _samr_EnumDomains(pipes_struct *p,
+                          struct samr_EnumDomains *r)
 {
+       NTSTATUS status;
        struct samr_info *info;
-       uint32 num_entries = 2;
-       fstring dom[2];
-       const char *name;
-
-       r_u->status = NT_STATUS_OK;
+       uint32_t num_entries = 2;
+       struct samr_SamEntry *entry_array = NULL;
+       struct samr_SamArray *sam;
 
-       if (!find_policy_by_hnd(p, &q_u->pol, (void**)(void *)&info))
+       if (!find_policy_by_hnd(p, r->in.connect_handle, (void**)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
-       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(info->acc_granted, SA_RIGHT_SAM_ENUM_DOMAINS, "_samr_enum_domains"))) {
-               return r_u->status;
+       status = access_check_samr_function(info->acc_granted,
+                                           SA_RIGHT_SAM_ENUM_DOMAINS,
+                                           "_samr_EnumDomains");
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       sam = TALLOC_ZERO_P(p->mem_ctx, struct samr_SamArray);
+       if (!sam) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       name = get_global_sam_name();
+       entry_array = TALLOC_ZERO_ARRAY(p->mem_ctx,
+                                       struct samr_SamEntry,
+                                       num_entries);
+       if (!entry_array) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       fstrcpy(dom[0],name);
-       strupper_m(dom[0]);
-       fstrcpy(dom[1],"Builtin");
+       entry_array[0].idx = 0;
+       init_lsa_String(&entry_array[0].name, get_global_sam_name());
 
-       if (!make_enum_domains(p->mem_ctx, &r_u->sam, &r_u->uni_dom_name, num_entries, dom))
-               return NT_STATUS_NO_MEMORY;
+       entry_array[1].idx = 1;
+       init_lsa_String(&entry_array[1].name, "Builtin");
 
-       init_samr_r_enum_domains(r_u, q_u->start_idx + num_entries, num_entries);
+       sam->count = num_entries;
+       sam->entries = entry_array;
 
-       return r_u->status;
+       *r->out.sam = sam;
+       *r->out.num_entries = num_entries;
+
+       return status;
 }
 
 /*******************************************************************
@@ -3152,10 +3564,11 @@ NTSTATUS _samr_OpenAlias(pipes_struct *p,
 /*******************************************************************
  set_user_info_7
  ********************************************************************/
+
 static NTSTATUS set_user_info_7(TALLOC_CTX *mem_ctx,
-                               const SAM_USER_INFO_7 *id7, struct samu *pwd)
+                               struct samr_UserInfo7 *id7,
+                               struct samu *pwd)
 {
-       fstring new_name;
        NTSTATUS rc;
 
        if (id7 == NULL) {
@@ -3164,7 +3577,7 @@ static NTSTATUS set_user_info_7(TALLOC_CTX *mem_ctx,
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       if(!rpcstr_pull(new_name, id7->uni_name.buffer, sizeof(new_name), id7->uni_name.uni_str_len*2, 0)) {
+       if (!id7->account_name.string) {
                DEBUG(5, ("set_user_info_7: failed to get new username\n"));
                TALLOC_FREE(pwd);
                return NT_STATUS_ACCESS_DENIED;
@@ -3179,12 +3592,12 @@ static NTSTATUS set_user_info_7(TALLOC_CTX *mem_ctx,
           simply that the rename fails with a slightly different status
           code (like UNSUCCESSFUL instead of ALREADY_EXISTS). */
 
-       rc = can_create(mem_ctx, new_name);
+       rc = can_create(mem_ctx, id7->account_name.string);
        if (!NT_STATUS_IS_OK(rc)) {
                return rc;
        }
 
-       rc = pdb_rename_sam_account(pwd, new_name);
+       rc = pdb_rename_sam_account(pwd, id7->account_name.string);
 
        TALLOC_FREE(pwd);
        return rc;
@@ -3194,7 +3607,8 @@ static NTSTATUS set_user_info_7(TALLOC_CTX *mem_ctx,
  set_user_info_16
  ********************************************************************/
 
-static bool set_user_info_16(const SAM_USER_INFO_16 *id16, struct samu *pwd)
+static bool set_user_info_16(struct samr_UserInfo16 *id16,
+                            struct samu *pwd)
 {
        if (id16 == NULL) {
                DEBUG(5, ("set_user_info_16: NULL id16\n"));
@@ -3203,7 +3617,7 @@ static bool set_user_info_16(const SAM_USER_INFO_16 *id16, struct samu *pwd)
        }
 
        /* FIX ME: check if the value is really changed --metze */
-       if (!pdb_set_acct_ctrl(pwd, id16->acb_info, PDB_CHANGED)) {
+       if (!pdb_set_acct_ctrl(pwd, id16->acct_flags, PDB_CHANGED)) {
                TALLOC_FREE(pwd);
                return False;
        }
@@ -3222,20 +3636,20 @@ static bool set_user_info_16(const SAM_USER_INFO_16 *id16, struct samu *pwd)
  set_user_info_18
  ********************************************************************/
 
-static bool set_user_info_18(SAM_USER_INFO_18 *id18, struct samu *pwd)
+static bool set_user_info_18(struct samr_UserInfo18 *id18,
+                            struct samu *pwd)
 {
-
        if (id18 == NULL) {
                DEBUG(2, ("set_user_info_18: id18 is NULL\n"));
                TALLOC_FREE(pwd);
                return False;
        }
 
-       if (!pdb_set_lanman_passwd (pwd, id18->lm_pwd, PDB_CHANGED)) {
+       if (!pdb_set_lanman_passwd (pwd, id18->lm_pwd.hash, PDB_CHANGED)) {
                TALLOC_FREE(pwd);
                return False;
        }
-       if (!pdb_set_nt_passwd     (pwd, id18->nt_pwd, PDB_CHANGED)) {
+       if (!pdb_set_nt_passwd     (pwd, id18->nt_pwd.hash, PDB_CHANGED)) {
                TALLOC_FREE(pwd);
                return False;
        }
@@ -3257,7 +3671,8 @@ static bool set_user_info_18(SAM_USER_INFO_18 *id18, struct samu *pwd)
  set_user_info_20
  ********************************************************************/
 
-static bool set_user_info_20(SAM_USER_INFO_20 *id20, struct samu *pwd)
+static bool set_user_info_20(struct samr_UserInfo20 *id20,
+                            struct samu *pwd)
 {
        if (id20 == NULL) {
                DEBUG(5, ("set_user_info_20: NULL id20\n"));
@@ -3276,14 +3691,15 @@ static bool set_user_info_20(SAM_USER_INFO_20 *id20, struct samu *pwd)
 
        return True;
 }
+
 /*******************************************************************
  set_user_info_21
  ********************************************************************/
 
-static NTSTATUS set_user_info_21(TALLOC_CTX *mem_ctx, SAM_USER_INFO_21 *id21,
+static NTSTATUS set_user_info_21(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo21 *id21,
                                 struct samu *pwd)
 {
-       fstring new_name;
        NTSTATUS status;
 
        if (id21 == NULL) {
@@ -3293,9 +3709,8 @@ static NTSTATUS set_user_info_21(TALLOC_CTX *mem_ctx, SAM_USER_INFO_21 *id21,
 
        /* we need to separately check for an account rename first */
 
-       if (rpcstr_pull(new_name, id21->uni_user_name.buffer,
-               sizeof(new_name), id21->uni_user_name.uni_str_len*2, 0)
-               && (!strequal(new_name, pdb_get_username(pwd))))
+       if (id21->account_name.string &&
+           (!strequal(id21->account_name.string, pdb_get_username(pwd))))
        {
 
                /* check to see if the new username already exists.  Note: we can't
@@ -3307,12 +3722,12 @@ static NTSTATUS set_user_info_21(TALLOC_CTX *mem_ctx, SAM_USER_INFO_21 *id21,
                   simply that the rename fails with a slightly different status
                   code (like UNSUCCESSFUL instead of ALREADY_EXISTS). */
 
-               status = can_create(mem_ctx, new_name);
+               status = can_create(mem_ctx, id21->account_name.string);
                if (!NT_STATUS_IS_OK(status)) {
                        return status;
                }
 
-               status = pdb_rename_sam_account(pwd, new_name);
+               status = pdb_rename_sam_account(pwd, id21->account_name.string);
 
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(0,("set_user_info_21: failed to rename account: %s\n",
@@ -3323,10 +3738,10 @@ static NTSTATUS set_user_info_21(TALLOC_CTX *mem_ctx, SAM_USER_INFO_21 *id21,
 
                /* set the new username so that later
                   functions can work on the new account */
-               pdb_set_username(pwd, new_name, PDB_SET);
+               pdb_set_username(pwd, id21->account_name.string, PDB_SET);
        }
 
-       copy_id21_to_sam_passwd(pwd, id21);
+       copy_id21_to_sam_passwd("INFO_21", pwd, id21);
 
        /*
         * The funny part about the previous two calls is
@@ -3361,7 +3776,8 @@ static NTSTATUS set_user_info_21(TALLOC_CTX *mem_ctx, SAM_USER_INFO_21 *id21,
  set_user_info_23
  ********************************************************************/
 
-static NTSTATUS set_user_info_23(TALLOC_CTX *mem_ctx, SAM_USER_INFO_23 *id23,
+static NTSTATUS set_user_info_23(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo23 *id23,
                                 struct samu *pwd)
 {
        char *plaintext_buf = NULL;
@@ -3380,7 +3796,7 @@ static NTSTATUS set_user_info_23(TALLOC_CTX *mem_ctx, SAM_USER_INFO_23 *id23,
        acct_ctrl = pdb_get_acct_ctrl(pwd);
 
        if (!decode_pw_buffer(mem_ctx,
-                               id23->pass,
+                               id23->password.data,
                                &plaintext_buf,
                                &len,
                                STR_UNICODE)) {
@@ -3528,7 +3944,8 @@ static bool set_user_info_pw(uint8 *pass, struct samu *pwd)
  set_user_info_25
  ********************************************************************/
 
-static NTSTATUS set_user_info_25(TALLOC_CTX *mem_ctx, SAM_USER_INFO_25 *id25,
+static NTSTATUS set_user_info_25(TALLOC_CTX *mem_ctx,
+                                struct samr_UserInfo25 *id25,
                                 struct samu *pwd)
 {
        NTSTATUS status;
@@ -3568,30 +3985,33 @@ static NTSTATUS set_user_info_25(TALLOC_CTX *mem_ctx, SAM_USER_INFO_25 *id25,
 }
 
 /*******************************************************************
- samr_reply_set_userinfo
+ samr_SetUserInfo_internal
  ********************************************************************/
 
-NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SET_USERINFO *r_u)
+static NTSTATUS samr_SetUserInfo_internal(const char *fn_name,
+                                         pipes_struct *p,
+                                         struct policy_handle *user_handle,
+                                         uint16_t level,
+                                         union samr_UserInfo *info)
 {
+       NTSTATUS status;
        struct samu *pwd = NULL;
        DOM_SID sid;
-       POLICY_HND *pol = &q_u->pol;
-       uint16 switch_value = q_u->switch_value;
-       SAM_USERINFO_CTR *ctr = q_u->ctr;
-       uint32 acc_granted;
-       uint32 acc_required;
+       POLICY_HND *pol = user_handle;
+       uint16_t switch_value = level;
+       uint32_t acc_granted;
+       uint32_t acc_required;
        bool ret;
        bool has_enough_rights = False;
-       uint32 acb_info;
+       uint32_t acb_info;
        DISP_INFO *disp_info = NULL;
 
-       DEBUG(5, ("_samr_set_userinfo: %d\n", __LINE__));
-
-       r_u->status = NT_STATUS_OK;
+       DEBUG(5,("%s: %d\n", fn_name, __LINE__));
 
        /* find the policy handle.  open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, pol, &sid, &acc_granted, &disp_info))
+       if (!get_lsa_policy_samr_sid(p, pol, &sid, &acc_granted, &disp_info)) {
                return NT_STATUS_INVALID_HANDLE;
+       }
 
        /* This is tricky.  A WinXP domain join sets
          (SA_RIGHT_USER_SET_PASSWORD|SA_RIGHT_USER_SET_ATTRIBUTES|SA_RIGHT_USER_ACCT_FLAGS_EXPIRY)
@@ -3608,23 +4028,28 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE
                acc_required = SA_RIGHT_USER_SET_PASSWORD;
                break;
        default:
-               acc_required = SA_RIGHT_USER_SET_PASSWORD | SA_RIGHT_USER_SET_ATTRIBUTES | SA_RIGHT_USER_ACCT_FLAGS_EXPIRY;
+               acc_required = SA_RIGHT_USER_SET_PASSWORD |
+                              SA_RIGHT_USER_SET_ATTRIBUTES |
+                              SA_RIGHT_USER_ACCT_FLAGS_EXPIRY;
                break;
        }
 
-       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, acc_required, "_samr_set_userinfo"))) {
-               return r_u->status;
+       status = access_check_samr_function(acc_granted,
+                                           acc_required,
+                                           fn_name);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       DEBUG(5, ("_samr_set_userinfo: sid:%s, level:%d\n",
-                 sid_string_dbg(&sid), switch_value));
+       DEBUG(5, ("%s: sid:%s, level:%d\n",
+                 fn_name, sid_string_dbg(&sid), switch_value));
 
-       if (ctr == NULL) {
-               DEBUG(5, ("_samr_set_userinfo: NULL info level\n"));
+       if (info == NULL) {
+               DEBUG(5, ("%s: NULL info level\n", fn_name));
                return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       if ( !(pwd = samu_new( NULL )) ) {
+       if (!(pwd = samu_new(NULL))) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -3632,7 +4057,7 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE
        ret = pdb_getsampwsid(pwd, &sid);
        unbecome_root();
 
-       if ( !ret ) {
+       if (!ret) {
                TALLOC_FREE(pwd);
                return NT_STATUS_NO_SUCH_USER;
        }
@@ -3641,244 +4066,169 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE
        /* check to see if we have the sufficient rights */
 
        acb_info = pdb_get_acct_ctrl(pwd);
-       if ( acb_info & ACB_WSTRUST )
-               has_enough_rights = user_has_privileges( p->pipe_user.nt_user_token, &se_machine_account);
-       else if ( acb_info & ACB_NORMAL )
-               has_enough_rights = user_has_privileges( p->pipe_user.nt_user_token, &se_add_users );
-       else if ( acb_info & (ACB_SVRTRUST|ACB_DOMTRUST) ) {
-               if ( lp_enable_privileges() )
-                       has_enough_rights = nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS );
+       if (acb_info & ACB_WSTRUST)
+               has_enough_rights = user_has_privileges(p->pipe_user.nt_user_token,
+                                                       &se_machine_account);
+       else if (acb_info & ACB_NORMAL)
+               has_enough_rights = user_has_privileges(p->pipe_user.nt_user_token,
+                                                       &se_add_users);
+       else if (acb_info & (ACB_SVRTRUST|ACB_DOMTRUST)) {
+               if (lp_enable_privileges()) {
+                       has_enough_rights = nt_token_check_domain_rid(p->pipe_user.nt_user_token,
+                                                                     DOMAIN_GROUP_RID_ADMINS);
+               }
        }
 
-       DEBUG(5, ("_samr_set_userinfo: %s does%s possess sufficient rights\n",
+       DEBUG(5, ("%s: %s does%s possess sufficient rights\n",
+                 fn_name,
                  uidtoname(p->pipe_user.ut.uid),
                  has_enough_rights ? "" : " not"));
 
        /* ================ BEGIN SeMachineAccountPrivilege BLOCK ================ */
 
-       if ( has_enough_rights )
+       if (has_enough_rights) {
                become_root();
+       }
 
        /* ok!  user info levels (lots: see MSDEV help), off we go... */
 
        switch (switch_value) {
+
+               case 7:
+                       status = set_user_info_7(p->mem_ctx,
+                                                &info->info7, pwd);
+                       break;
+
+               case 16:
+                       if (!set_user_info_16(&info->info16, pwd)) {
+                               status = NT_STATUS_ACCESS_DENIED;
+                       }
+                       break;
+
                case 18:
-                       if (!set_user_info_18(ctr->info.id18, pwd))
-                               r_u->status = NT_STATUS_ACCESS_DENIED;
+                       /* Used by AS/U JRA. */
+                       if (!set_user_info_18(&info->info18, pwd)) {
+                               status = NT_STATUS_ACCESS_DENIED;
+                       }
                        break;
 
-               case 24:
+               case 20:
+                       if (!set_user_info_20(&info->info20, pwd)) {
+                               status = NT_STATUS_ACCESS_DENIED;
+                       }
+                       break;
+
+               case 21:
+                       status = set_user_info_21(p->mem_ctx,
+                                                 &info->info21, pwd);
+                       break;
+
+               case 23:
                        if (!p->session_key.length) {
-                               r_u->status = NT_STATUS_NO_USER_SESSION_KEY;
+                               status = NT_STATUS_NO_USER_SESSION_KEY;
                        }
-                       SamOEMhashBlob(ctr->info.id24->pass, 516, &p->session_key);
+                       SamOEMhashBlob(info->info23.password.data, 516,
+                                      &p->session_key);
 
-                       dump_data(100, ctr->info.id24->pass, 516);
+                       dump_data(100, info->info23.password.data, 516);
 
-                       if (!set_user_info_pw(ctr->info.id24->pass, pwd))
-                               r_u->status = NT_STATUS_ACCESS_DENIED;
+                       status = set_user_info_23(p->mem_ctx,
+                                                 &info->info23, pwd);
                        break;
 
-               case 25:
+               case 24:
                        if (!p->session_key.length) {
-                               r_u->status = NT_STATUS_NO_USER_SESSION_KEY;
+                               status = NT_STATUS_NO_USER_SESSION_KEY;
                        }
-                       encode_or_decode_arc4_passwd_buffer(ctr->info.id25->pass, &p->session_key);
+                       SamOEMhashBlob(info->info24.password.data,
+                                      516,
+                                      &p->session_key);
 
-                       dump_data(100, ctr->info.id25->pass, 532);
+                       dump_data(100, info->info24.password.data, 516);
 
-                       r_u->status = set_user_info_25(p->mem_ctx,
-                                                      ctr->info.id25, pwd);
-                       if (!NT_STATUS_IS_OK(r_u->status)) {
-                               goto done;
+                       if (!set_user_info_pw(info->info24.password.data, pwd)) {
+                               status = NT_STATUS_ACCESS_DENIED;
                        }
-                       if (!set_user_info_pw(ctr->info.id25->pass, pwd))
-                               r_u->status = NT_STATUS_ACCESS_DENIED;
                        break;
 
-               case 26:
+               case 25:
                        if (!p->session_key.length) {
-                               r_u->status = NT_STATUS_NO_USER_SESSION_KEY;
+                               status = NT_STATUS_NO_USER_SESSION_KEY;
                        }
-                       encode_or_decode_arc4_passwd_buffer(ctr->info.id26->pass, &p->session_key);
+                       encode_or_decode_arc4_passwd_buffer(info->info25.password.data,
+                                                           &p->session_key);
 
-                       dump_data(100, ctr->info.id26->pass, 516);
+                       dump_data(100, info->info25.password.data, 532);
 
-                       if (!set_user_info_pw(ctr->info.id26->pass, pwd))
-                               r_u->status = NT_STATUS_ACCESS_DENIED;
+                       status = set_user_info_25(p->mem_ctx,
+                                                 &info->info25, pwd);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               goto done;
+                       }
+                       if (!set_user_info_pw(info->info25.password.data, pwd)) {
+                               status = NT_STATUS_ACCESS_DENIED;
+                       }
                        break;
 
-               case 23:
+               case 26:
                        if (!p->session_key.length) {
-                               r_u->status = NT_STATUS_NO_USER_SESSION_KEY;
+                               status = NT_STATUS_NO_USER_SESSION_KEY;
                        }
-                       SamOEMhashBlob(ctr->info.id23->pass, 516, &p->session_key);
+                       encode_or_decode_arc4_passwd_buffer(info->info26.password.data,
+                                                           &p->session_key);
 
-                       dump_data(100, ctr->info.id23->pass, 516);
+                       dump_data(100, info->info26.password.data, 516);
 
-                       r_u->status = set_user_info_23(p->mem_ctx,
-                                                      ctr->info.id23, pwd);
+                       if (!set_user_info_pw(info->info26.password.data, pwd)) {
+                               status = NT_STATUS_ACCESS_DENIED;
+                       }
                        break;
 
                default:
-                       r_u->status = NT_STATUS_INVALID_INFO_CLASS;
+                       status = NT_STATUS_INVALID_INFO_CLASS;
        }
 
  done:
 
-       if ( has_enough_rights )
+       if (has_enough_rights) {
                unbecome_root();
+       }
 
        /* ================ END SeMachineAccountPrivilege BLOCK ================ */
 
-       if (NT_STATUS_IS_OK(r_u->status)) {
+       if (NT_STATUS_IS_OK(status)) {
                force_flush_samr_cache(disp_info);
        }
 
-       return r_u->status;
+       return status;
 }
 
 /*******************************************************************
- samr_reply_set_userinfo2
+ _samr_SetUserInfo
  ********************************************************************/
 
-NTSTATUS _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_SET_USERINFO2 *r_u)
+NTSTATUS _samr_SetUserInfo(pipes_struct *p,
+                          struct samr_SetUserInfo *r)
 {
-       struct samu *pwd = NULL;
-       DOM_SID sid;
-       SAM_USERINFO_CTR *ctr = q_u->ctr;
-       POLICY_HND *pol = &q_u->pol;
-       uint16 switch_value = q_u->switch_value;
-       uint32 acc_granted;
-       uint32 acc_required;
-       bool ret;
-       bool has_enough_rights = False;
-       uint32 acb_info;
-       DISP_INFO *disp_info = NULL;
-
-       DEBUG(5, ("samr_reply_set_userinfo2: %d\n", __LINE__));
-
-       r_u->status = NT_STATUS_OK;
-
-       /* find the policy handle.  open a policy on it. */
-       if (!get_lsa_policy_samr_sid(p, pol, &sid, &acc_granted, &disp_info))
-               return NT_STATUS_INVALID_HANDLE;
-
-
-#if 0  /* this really should be applied on a per info level basis   --jerry */
-
-       /* observed when joining XP client to Samba domain */
-       acc_required = SA_RIGHT_USER_SET_PASSWORD | SA_RIGHT_USER_SET_ATTRIBUTES | SA_RIGHT_USER_ACCT_FLAGS_EXPIRY;
-#else
-       acc_required = SA_RIGHT_USER_SET_ATTRIBUTES;
-#endif
-
-       if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, acc_required, "_samr_set_userinfo2"))) {
-               return r_u->status;
-       }
-
-       DEBUG(5, ("samr_reply_set_userinfo2: sid:%s\n",
-                 sid_string_dbg(&sid)));
-
-       if (ctr == NULL) {
-               DEBUG(5, ("samr_reply_set_userinfo2: NULL info level\n"));
-               return NT_STATUS_INVALID_INFO_CLASS;
-       }
-
-       switch_value=ctr->switch_value;
-
-       if ( !(pwd = samu_new( NULL )) ) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       become_root();
-       ret = pdb_getsampwsid(pwd, &sid);
-       unbecome_root();
-
-       if ( !ret ) {
-               TALLOC_FREE(pwd);
-               return NT_STATUS_NO_SUCH_USER;
-       }
-
-       acb_info = pdb_get_acct_ctrl(pwd);
-       if ( acb_info & ACB_WSTRUST )
-               has_enough_rights = user_has_privileges( p->pipe_user.nt_user_token, &se_machine_account);
-       else if ( acb_info & ACB_NORMAL )
-               has_enough_rights = user_has_privileges( p->pipe_user.nt_user_token, &se_add_users );
-       else if ( acb_info & (ACB_SVRTRUST|ACB_DOMTRUST) ) {
-               if ( lp_enable_privileges() )
-                       has_enough_rights = nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS );
-       }
-
-       DEBUG(5, ("_samr_set_userinfo2: %s does%s possess sufficient rights\n",
-                 uidtoname(p->pipe_user.ut.uid),
-                 has_enough_rights ? "" : " not"));
-
-       /* ================ BEGIN SeMachineAccountPrivilege BLOCK ================ */
-
-       if ( has_enough_rights )
-               become_root();
-
-       /* ok!  user info levels (lots: see MSDEV help), off we go... */
-
-       switch (switch_value) {
-               case 7:
-                       r_u->status = set_user_info_7(p->mem_ctx,
-                                                     ctr->info.id7, pwd);
-                       break;
-               case 16:
-                       if (!set_user_info_16(ctr->info.id16, pwd))
-                               r_u->status = NT_STATUS_ACCESS_DENIED;
-                       break;
-               case 18:
-                       /* Used by AS/U JRA. */
-                       if (!set_user_info_18(ctr->info.id18, pwd))
-                               r_u->status = NT_STATUS_ACCESS_DENIED;
-                       break;
-               case 20:
-                       if (!set_user_info_20(ctr->info.id20, pwd))
-                               r_u->status = NT_STATUS_ACCESS_DENIED;
-                       break;
-               case 21:
-                       r_u->status = set_user_info_21(p->mem_ctx,
-                                                      ctr->info.id21, pwd);
-                       break;
-               case 23:
-                       if (!p->session_key.length) {
-                               r_u->status = NT_STATUS_NO_USER_SESSION_KEY;
-                       }
-                       SamOEMhashBlob(ctr->info.id23->pass, 516, &p->session_key);
-
-                       dump_data(100, ctr->info.id23->pass, 516);
-
-                       r_u->status = set_user_info_23(p->mem_ctx,
-                                                      ctr->info.id23, pwd);
-                       break;
-               case 26:
-                       if (!p->session_key.length) {
-                               r_u->status = NT_STATUS_NO_USER_SESSION_KEY;
-                       }
-                       encode_or_decode_arc4_passwd_buffer(ctr->info.id26->pass, &p->session_key);
-
-                       dump_data(100, ctr->info.id26->pass, 516);
-
-                       if (!set_user_info_pw(ctr->info.id26->pass, pwd))
-                               r_u->status = NT_STATUS_ACCESS_DENIED;
-                       break;
-               default:
-                       r_u->status = NT_STATUS_INVALID_INFO_CLASS;
-       }
-
-       if ( has_enough_rights )
-               unbecome_root();
-
-       /* ================ END SeMachineAccountPrivilege BLOCK ================ */
+       return samr_SetUserInfo_internal("_samr_SetUserInfo",
+                                        p,
+                                        r->in.user_handle,
+                                        r->in.level,
+                                        r->in.info);
+}
 
-       if (NT_STATUS_IS_OK(r_u->status)) {
-               force_flush_samr_cache(disp_info);
-       }
+/*******************************************************************
+ _samr_SetUserInfo2
+ ********************************************************************/
 
-       return r_u->status;
+NTSTATUS _samr_SetUserInfo2(pipes_struct *p,
+                           struct samr_SetUserInfo2 *r)
+{
+       return samr_SetUserInfo_internal("_samr_SetUserInfo2",
+                                        p,
+                                        r->in.user_handle,
+                                        r->in.level,
+                                        r->in.info);
 }
 
 /*********************************************************************
@@ -5218,26 +5568,6 @@ NTSTATUS _samr_Shutdown(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_EnumDomains(pipes_struct *p,
-                          struct samr_EnumDomains *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
-NTSTATUS _samr_EnumDomainGroups(pipes_struct *p,
-                               struct samr_EnumDomainGroups *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS _samr_CreateUser(pipes_struct *p,
                          struct samr_CreateUser *r)
 {
@@ -5248,26 +5578,6 @@ NTSTATUS _samr_CreateUser(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_EnumDomainUsers(pipes_struct *p,
-                              struct samr_EnumDomainUsers *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
-NTSTATUS _samr_EnumDomainAliases(pipes_struct *p,
-                                struct samr_EnumDomainAliases *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS _samr_SetMemberAttributesOfGroup(pipes_struct *p,
                                          struct samr_SetMemberAttributesOfGroup *r)
 {
@@ -5278,26 +5588,6 @@ NTSTATUS _samr_SetMemberAttributesOfGroup(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_QueryUserInfo(pipes_struct *p,
-                            struct samr_QueryUserInfo *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
-NTSTATUS _samr_SetUserInfo(pipes_struct *p,
-                          struct samr_SetUserInfo *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS _samr_ChangePasswordUser(pipes_struct *p,
                                  struct samr_ChangePasswordUser *r)
 {
@@ -5348,16 +5638,6 @@ NTSTATUS _samr_QueryUserInfo2(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_QueryDisplayInfo2(pipes_struct *p,
-                                struct samr_QueryDisplayInfo2 *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS _samr_GetDisplayEnumerationIndex2(pipes_struct *p,
                                           struct samr_GetDisplayEnumerationIndex2 *r)
 {
@@ -5368,16 +5648,6 @@ NTSTATUS _samr_GetDisplayEnumerationIndex2(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_QueryDisplayInfo3(pipes_struct *p,
-                                struct samr_QueryDisplayInfo3 *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS _samr_AddMultipleMembersToAlias(pipes_struct *p,
                                         struct samr_AddMultipleMembersToAlias *r)
 {
@@ -5408,16 +5678,6 @@ NTSTATUS _samr_OemChangePasswordUser2(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_SetUserInfo2(pipes_struct *p,
-                           struct samr_SetUserInfo2 *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS _samr_SetBootKeyInformation(pipes_struct *p,
                                     struct samr_SetBootKeyInformation *r)
 {