first pass at updating head branch to be to be the same as the SAMBA_2_0 branch
[bbaumbach/samba-autobuild/.git] / source3 / rpcclient / cmd_samr.c
index fb2accfc4d23eef57f21d14f0477c544846104b8..023bf512e8a4144d893f8ba3baf0ce1b6436a5db 100644 (file)
@@ -94,10 +94,10 @@ void cmd_sam_ntchange_pwd(struct client_info *info)
        res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
 
        /* establish a connection. */
-       res = res ? samr_unknown_38(smb_cli, srv_name) : False;
+       res = res ? do_samr_unknown_38(smb_cli, srv_name) : False;
 
        /* establish a connection. */
-       res = res ? samr_chgpasswd_user(smb_cli,
+       res = res ? do_samr_chgpasswd_user(smb_cli,
                                           srv_name, smb_cli->user_name,
                                           nt_newpass, nt_hshhash,
                                           lm_newpass, lm_hshhash) : False;
@@ -156,7 +156,7 @@ void cmd_sam_test(struct client_info *info)
        res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
 
        /* establish a connection. */
-       res = res ? samr_unknown_38(smb_cli, srv_name) : False;
+       res = res ? do_samr_unknown_38(smb_cli, srv_name) : False;
 
        /* close the session */
        cli_nt_session_close(smb_cli);
@@ -171,840 +171,6 @@ void cmd_sam_test(struct client_info *info)
        }
 }
 
-/****************************************************************************
-SAM delete alias member.
-****************************************************************************/
-void cmd_sam_del_aliasmem(struct client_info *info)
-{
-       fstring srv_name;
-       fstring domain;
-       fstring tmp;
-       fstring sid;
-       DOM_SID sid1;
-       POLICY_HND alias_pol;
-       BOOL res = True;
-       BOOL res1 = True;
-       BOOL res2 = True;
-       uint32 flags = 0x200003f3; /* absolutely no idea. */
-       DOM_SID member_sid; 
-       uint32 alias_rid;
-
-       sid_copy(&sid1, &info->dom.level5_sid);
-       sid_to_string(sid, &sid1);
-       fstrcpy(domain, info->dom.level5_dom);
-
-       if (sid1.num_auths == 0)
-       {
-               fprintf(out_hnd, "please use 'lsaquery' first, to ascertain the SID\n");
-               return;
-       }
-
-       fstrcpy(srv_name, "\\\\");
-       fstrcat(srv_name, info->dest_host);
-       strupper(srv_name);
-
-       if (!next_token(NULL, tmp, NULL, sizeof(tmp)))
-       {
-               fprintf(out_hnd, "delaliasmem: <alias rid> [member sid1] [member sid2] ...\n");
-               return;
-       }
-       alias_rid = get_number(tmp);
-
-       fprintf(out_hnd, "SAM Domain Alias Member\n");
-
-       /* open SAMR session.  negotiate credentials */
-       res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
-
-       /* establish a connection. */
-       res = res ? samr_connect(smb_cli, 
-                               srv_name, 0x00000020,
-                               &info->dom.samr_pol_connect) : False;
-
-       /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid1,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       /* connect to the domain */
-       res1 = res ? samr_open_alias(smb_cli,
-                   &info->dom.samr_pol_open_domain,
-                   0x000f001f, alias_rid, &alias_pol) : False;
-
-       while (next_token(NULL, tmp, NULL, sizeof(tmp)) && res2 && res1)
-       {
-               /* get a sid, delete a member from the alias */
-               res2 = res2 ? string_to_sid(&member_sid, tmp) : False;
-               res2 = res2 ? samr_del_aliasmem(smb_cli, &alias_pol, &member_sid) : False;
-
-               if (res2)
-               {
-                       fprintf(out_hnd, "SID deleted from Alias 0x%x: %s\n", alias_rid, tmp);
-               }
-       }
-
-       res1 = res1 ? samr_close(smb_cli, &alias_pol) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_open_domain) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_connect) : False;
-
-       /* close the session */
-       cli_nt_session_close(smb_cli);
-
-       if (res && res1 && res2)
-       {
-               DEBUG(5,("cmd_sam_del_aliasmem: succeeded\n"));
-               fprintf(out_hnd, "Delete Domain Alias Member: OK\n");
-       }
-       else
-       {
-               DEBUG(5,("cmd_sam_del_aliasmem: failed\n"));
-               fprintf(out_hnd, "Delete Domain Alias Member: FAILED\n");
-       }
-}
-
-/****************************************************************************
-SAM delete alias.
-****************************************************************************/
-void cmd_sam_delete_dom_alias(struct client_info *info)
-{
-       fstring srv_name;
-       fstring domain;
-       fstring name;
-       fstring sid;
-       DOM_SID sid1;
-       POLICY_HND alias_pol;
-       BOOL res = True;
-       BOOL res1 = True;
-       BOOL res2 = True;
-       uint32 flags = 0x200003f3; /* absolutely no idea. */
-       uint32 alias_rid = 0;
-       const char *names[1];
-       uint32 rid [MAX_LOOKUP_SIDS];
-       uint32 type[MAX_LOOKUP_SIDS];
-       uint32 num_rids;
-
-       sid_copy(&sid1, &info->dom.level5_sid);
-       sid_to_string(sid, &sid1);
-       fstrcpy(domain, info->dom.level5_dom);
-
-       if (sid1.num_auths == 0)
-       {
-               fprintf(out_hnd, "please use 'lsaquery' first, to ascertain the SID\n");
-               return;
-       }
-
-       fstrcpy(srv_name, "\\\\");
-       fstrcat(srv_name, info->dest_host);
-       strupper(srv_name);
-
-       if (!next_token(NULL, name, NULL, sizeof(name)))
-       {
-               fprintf(out_hnd, "delalias <alias name>\n");
-               return;
-       }
-
-       fprintf(out_hnd, "SAM Delete Domain Alias\n");
-
-       /* open SAMR session.  negotiate credentials */
-       res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
-
-       /* establish a connection. */
-       res = res ? samr_connect(smb_cli, 
-                               srv_name, 0x00000020,
-                               &info->dom.samr_pol_connect) : False;
-
-       /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid1,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       names[0] = name;
-
-       res1 = res ? samr_query_lookup_names(smb_cli,
-                   &info->dom.samr_pol_open_domain, 0x000003e8,
-                   1, names,
-                   &num_rids, rid, type) : False;
-
-       if (res1 && num_rids == 1)
-       {
-               alias_rid = rid[0];
-       }
-
-       /* connect to the domain */
-       res1 = res1 ? samr_open_alias(smb_cli,
-                   &info->dom.samr_pol_open_domain,
-                   0x000f001f, alias_rid, &alias_pol) : False;
-
-       res2 = res1 ? samr_delete_dom_alias(smb_cli, &alias_pol) : False;
-
-       res1 = res1 ? samr_close(smb_cli, &alias_pol) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_open_domain) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_connect) : False;
-
-       /* close the session */
-       cli_nt_session_close(smb_cli);
-
-       if (res && res1 && res2)
-       {
-               DEBUG(5,("cmd_sam_delete_dom_alias: succeeded\n"));
-               fprintf(out_hnd, "Delete Domain Alias: OK\n");
-       }
-       else
-       {
-               DEBUG(5,("cmd_sam_delete_dom_alias: failed\n"));
-               fprintf(out_hnd, "Delete Domain Alias: FAILED\n");
-       }
-}
-
-
-/****************************************************************************
-SAM add alias member.
-****************************************************************************/
-void cmd_sam_add_aliasmem(struct client_info *info)
-{
-       fstring srv_name;
-       fstring domain;
-       fstring tmp;
-       fstring sid;
-       DOM_SID sid1;
-       POLICY_HND alias_pol;
-       BOOL res = True;
-       BOOL res1 = True;
-       BOOL res2 = True;
-       BOOL res3 = True;
-       BOOL res4 = True;
-       uint32 flags = 0x200003f3; /* absolutely no idea. */
-       uint32 alias_rid;
-       const char **names = NULL;
-       uint32 num_names = 0;
-       DOM_SID *sids; 
-       uint32 num_sids;
-       int i;
-
-       sid_copy(&sid1, &info->dom.level5_sid);
-       sid_to_string(sid, &sid1);
-       fstrcpy(domain, info->dom.level5_dom);
-
-       if (sid1.num_auths == 0)
-       {
-               fprintf(out_hnd, "please use 'lsaquery' first, to ascertain the SID\n");
-               return;
-       }
-
-       fstrcpy(srv_name, "\\\\");
-       fstrcat(srv_name, info->dest_host);
-       strupper(srv_name);
-
-       while (next_token(NULL, tmp, NULL, sizeof(tmp)))
-       {
-               num_names++;
-               names = Realloc(names, num_names * sizeof(char*));
-               if (names == NULL)
-               {
-                       DEBUG(0,("Realloc returned NULL\n"));
-                       return;
-               }
-               names[num_names-1] = strdup(tmp);
-       }
-
-       if (num_names < 2)
-       {
-               fprintf(out_hnd, "addaliasmem <group name> [member name1] [member name2] ...\n");
-               return;
-       }
-       
-       fprintf(out_hnd, "SAM Domain Alias Member\n");
-
-       /* open LSARPC session. */
-       res3 = res3 ? cli_nt_session_open(smb_cli, PIPE_LSARPC) : False;
-
-       /* lookup domain controller; receive a policy handle */
-       res3 = res3 ? lsa_open_policy(smb_cli,
-                               srv_name,
-                               &info->dom.lsa_info_pol, True) : False;
-
-       /* send lsa lookup sids call */
-       res4 = res3 ? lsa_lookup_names(smb_cli, 
-                                      &info->dom.lsa_info_pol,
-                                      num_names, names, 
-                                      &sids, &num_sids) : False;
-
-       res3 = res3 ? lsa_close(smb_cli, &info->dom.lsa_info_pol) : False;
-
-       cli_nt_session_close(smb_cli);
-
-       res4 = num_sids < 2 ? False : res4;
-
-       if (res4)
-       {
-               /*
-                * accept domain sid or builtin sid
-                */
-
-               DOM_SID sid_1_5_20;
-               string_to_sid(&sid_1_5_20, "S-1-5-32");
-               sid_split_rid(&sids[0], &alias_rid);
-
-               if (sid_equal(&sids[0], &sid_1_5_20))
-               {
-                       sid_copy(&sid1, &sid_1_5_20);
-               }
-               else if (!sid_equal(&sids[0], &sid1))
-               {       
-                       res4 = False;
-               }
-       }
-
-       /* open SAMR session.  negotiate credentials */
-       res = res4 ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
-
-       /* establish a connection. */
-       res = res ? samr_connect(smb_cli, 
-                               srv_name, 0x00000020,
-                               &info->dom.samr_pol_connect) : False;
-
-       /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid1,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       /* connect to the domain */
-       res1 = res ? samr_open_alias(smb_cli,
-                   &info->dom.samr_pol_open_domain,
-                   0x000f001f, alias_rid, &alias_pol) : False;
-
-       for (i = 1; i < num_sids && res2 && res1; i++)
-       {
-               /* add a member to the alias */
-               res2 = res2 ? samr_add_aliasmem(smb_cli, &alias_pol, &sids[i]) : False;
-
-               if (res2)
-               {
-                       sid_to_string(tmp, &sids[i]);
-                       fprintf(out_hnd, "SID added to Alias 0x%x: %s\n", alias_rid, tmp);
-               }
-       }
-
-       res1 = res1 ? samr_close(smb_cli, &alias_pol) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_open_domain) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_connect) : False;
-
-       /* close the session */
-       cli_nt_session_close(smb_cli);
-
-       if (sids != NULL)
-       {
-               free(sids);
-       }
-       
-       if (names != NULL)
-       {
-               for (i = 0; i < num_names; i++)
-               {
-                       if (names[i] != NULL)
-                       {
-                               free(((char**)(names))[i]);
-                       }
-               }
-               free(names);
-       }
-       
-       if (res && res1 && res2)
-       {
-               DEBUG(5,("cmd_sam_add_aliasmem: succeeded\n"));
-               fprintf(out_hnd, "Add Domain Alias Member: OK\n");
-       }
-       else
-       {
-               DEBUG(5,("cmd_sam_add_aliasmem: failed\n"));
-               fprintf(out_hnd, "Add Domain Alias Member: FAILED\n");
-       }
-}
-
-
-/****************************************************************************
-SAM create domain alias.
-****************************************************************************/
-void cmd_sam_create_dom_alias(struct client_info *info)
-{
-       fstring srv_name;
-       fstring domain;
-       fstring acct_name;
-       fstring acct_desc;
-       fstring sid;
-       DOM_SID sid1;
-       BOOL res = True;
-       BOOL res1 = True;
-       uint32 flags = 0x200003f3; /* absolutely no idea. */
-       uint32 alias_rid; 
-
-       sid_copy(&sid1, &info->dom.level5_sid);
-       sid_to_string(sid, &sid1);
-       fstrcpy(domain, info->dom.level5_dom);
-
-       if (sid1.num_auths == 0)
-       {
-               fprintf(out_hnd, "please use 'lsaquery' first, to ascertain the SID\n");
-               return;
-       }
-
-
-       fstrcpy(srv_name, "\\\\");
-       fstrcat(srv_name, info->dest_host);
-       strupper(srv_name);
-
-       if (!next_token(NULL, acct_name, NULL, sizeof(acct_name)))
-       {
-               fprintf(out_hnd, "createalias: <acct name> [acct description]\n");
-       }
-
-       if (!next_token(NULL, acct_desc, NULL, sizeof(acct_desc)))
-       {
-               acct_desc[0] = 0;
-       }
-
-
-       fprintf(out_hnd, "SAM Create Domain Alias\n");
-       fprintf(out_hnd, "Domain: %s Name: %s Description: %s\n",
-                         domain, acct_name, acct_desc);
-
-       /* open SAMR session.  negotiate credentials */
-       res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
-
-       /* establish a connection. */
-       res = res ? samr_connect(smb_cli, 
-                               srv_name, 0x00000020,
-                               &info->dom.samr_pol_connect) : False;
-
-       /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid1,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       /* create a domain alias */
-       res1 = res ? create_samr_domain_alias(smb_cli, 
-                               &info->dom.samr_pol_open_domain,
-                               acct_name, acct_desc, &alias_rid) : False;
-
-       res = res ? samr_close(smb_cli,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       res = res ? samr_close(smb_cli,
-                   &info->dom.samr_pol_connect) : False;
-
-       /* close the session */
-       cli_nt_session_close(smb_cli);
-
-       if (res && res1)
-       {
-               DEBUG(5,("cmd_sam_create_dom_alias: succeeded\n"));
-               fprintf(out_hnd, "Create Domain Alias: OK\n");
-       }
-       else
-       {
-               DEBUG(5,("cmd_sam_create_dom_alias: failed\n"));
-               fprintf(out_hnd, "Create Domain Alias: FAILED\n");
-       }
-}
-
-
-/****************************************************************************
-SAM delete group member.
-****************************************************************************/
-void cmd_sam_del_groupmem(struct client_info *info)
-{
-       fstring srv_name;
-       fstring domain;
-       fstring tmp;
-       fstring sid;
-       DOM_SID sid1;
-       POLICY_HND group_pol;
-       BOOL res = True;
-       BOOL res1 = True;
-       BOOL res2 = True;
-       uint32 flags = 0x200003f3; /* absolutely no idea. */
-       uint32 member_rid; 
-       uint32 group_rid;
-
-       sid_copy(&sid1, &info->dom.level5_sid);
-       sid_to_string(sid, &sid1);
-       fstrcpy(domain, info->dom.level5_dom);
-
-       if (sid1.num_auths == 0)
-       {
-               fprintf(out_hnd, "please use 'lsaquery' first, to ascertain the SID\n");
-               return;
-       }
-
-       fstrcpy(srv_name, "\\\\");
-       fstrcat(srv_name, info->dest_host);
-       strupper(srv_name);
-
-       if (!next_token(NULL, tmp, NULL, sizeof(tmp)))
-       {
-               fprintf(out_hnd, "delgroupmem: <group rid> [member rid1] [member rid2] ...\n");
-               return;
-       }
-       group_rid = get_number(tmp);
-
-       fprintf(out_hnd, "SAM Add Domain Group member\n");
-
-       /* open SAMR session.  negotiate credentials */
-       res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
-
-       /* establish a connection. */
-       res = res ? samr_connect(smb_cli, 
-                               srv_name, 0x00000020,
-                               &info->dom.samr_pol_connect) : False;
-
-       /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid1,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       /* connect to the domain */
-       res1 = res ? samr_open_group(smb_cli,
-                   &info->dom.samr_pol_open_domain,
-                   0x0000001f, group_rid, &group_pol) : False;
-
-       while (next_token(NULL, tmp, NULL, sizeof(tmp)) && res2 && res1)
-       {
-               /* get a rid, delete a member from the group */
-               member_rid = get_number(tmp);
-               res2 = res2 ? samr_del_groupmem(smb_cli, &group_pol, member_rid) : False;
-
-               if (res2)
-               {
-                       fprintf(out_hnd, "RID deleted from Group 0x%x: 0x%x\n", group_rid, member_rid);
-               }
-       }
-
-       res1 = res1 ? samr_close(smb_cli, &group_pol) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_open_domain) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_connect) : False;
-
-       /* close the session */
-       cli_nt_session_close(smb_cli);
-
-       if (res && res1 && res2)
-       {
-               DEBUG(5,("cmd_sam_del_groupmem: succeeded\n"));
-               fprintf(out_hnd, "Add Domain Group Member: OK\n");
-       }
-       else
-       {
-               DEBUG(5,("cmd_sam_del_groupmem: failed\n"));
-               fprintf(out_hnd, "Add Domain Group Member: FAILED\n");
-       }
-}
-
-
-/****************************************************************************
-SAM delete group.
-****************************************************************************/
-void cmd_sam_delete_dom_group(struct client_info *info)
-{
-       fstring srv_name;
-       fstring domain;
-       fstring name;
-       fstring sid;
-       DOM_SID sid1;
-       POLICY_HND group_pol;
-       BOOL res = True;
-       BOOL res1 = True;
-       BOOL res2 = True;
-       uint32 flags = 0x200003f3; /* absolutely no idea. */
-       uint32 group_rid = 0;
-       const char *names[1];
-       uint32 rid [MAX_LOOKUP_SIDS];
-       uint32 type[MAX_LOOKUP_SIDS];
-       uint32 num_rids;
-
-       sid_copy(&sid1, &info->dom.level5_sid);
-       sid_to_string(sid, &sid1);
-       fstrcpy(domain, info->dom.level5_dom);
-
-       if (sid1.num_auths == 0)
-       {
-               fprintf(out_hnd, "please use 'lsaquery' first, to ascertain the SID\n");
-               return;
-       }
-
-       fstrcpy(srv_name, "\\\\");
-       fstrcat(srv_name, info->dest_host);
-       strupper(srv_name);
-
-       if (!next_token(NULL, name, NULL, sizeof(name)))
-       {
-               fprintf(out_hnd, "delgroup <group name>\n");
-               return;
-       }
-
-       fprintf(out_hnd, "SAM Delete Domain Group\n");
-
-       /* open SAMR session.  negotiate credentials */
-       res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
-
-       /* establish a connection. */
-       res = res ? samr_connect(smb_cli, 
-                               srv_name, 0x00000020,
-                               &info->dom.samr_pol_connect) : False;
-
-       /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid1,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       names[0] = name;
-
-       res1 = res ? samr_query_lookup_names(smb_cli,
-                   &info->dom.samr_pol_open_domain, 0x000003e8,
-                   1, names,
-                   &num_rids, rid, type) : False;
-
-       if (res1 && num_rids == 1)
-       {
-               group_rid = rid[0];
-       }
-
-       /* connect to the domain */
-       res1 = res1 ? samr_open_group(smb_cli,
-                   &info->dom.samr_pol_open_domain,
-                   0x0000001f, group_rid, &group_pol) : False;
-
-       res2 = res1 ? samr_delete_dom_group(smb_cli, &group_pol) : False;
-
-       res1 = res1 ? samr_close(smb_cli, &group_pol) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_open_domain) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_connect) : False;
-
-       /* close the session */
-       cli_nt_session_close(smb_cli);
-
-       if (res && res1 && res2)
-       {
-               DEBUG(5,("cmd_sam_delete_dom_group: succeeded\n"));
-               fprintf(out_hnd, "Delete Domain Group: OK\n");
-       }
-       else
-       {
-               DEBUG(5,("cmd_sam_delete_dom_group: failed\n"));
-               fprintf(out_hnd, "Delete Domain Group: FAILED\n");
-       }
-}
-
-
-/****************************************************************************
-SAM add group member.
-****************************************************************************/
-void cmd_sam_add_groupmem(struct client_info *info)
-{
-       fstring srv_name;
-       fstring domain;
-       fstring tmp;
-       fstring sid;
-       DOM_SID sid1;
-       POLICY_HND group_pol;
-       BOOL res = True;
-       BOOL res1 = True;
-       BOOL res2 = True;
-       uint32 flags = 0x200003f3; /* absolutely no idea. */
-       uint32 group_rid = 0;
-       const char **names = NULL;
-       uint32 num_names = 0;
-       uint32 rid [MAX_LOOKUP_SIDS];
-       uint32 type[MAX_LOOKUP_SIDS];
-       uint32 num_rids;
-       int i;
-
-       sid_copy(&sid1, &info->dom.level5_sid);
-       sid_to_string(sid, &sid1);
-       fstrcpy(domain, info->dom.level5_dom);
-
-       if (sid1.num_auths == 0)
-       {
-               fprintf(out_hnd, "please use 'lsaquery' first, to ascertain the SID\n");
-               return;
-       }
-
-       fstrcpy(srv_name, "\\\\");
-       fstrcat(srv_name, info->dest_host);
-       strupper(srv_name);
-
-       while (next_token(NULL, tmp, NULL, sizeof(tmp)))
-       {
-               num_names++;
-               names = Realloc(names, num_names * sizeof(char*));
-               if (names == NULL)
-               {
-                       DEBUG(0,("Realloc returned NULL\n"));
-                       return;
-               }
-               names[num_names-1] = strdup(tmp);
-       }
-
-       if (num_names < 2)
-       {
-               fprintf(out_hnd, "addgroupmem <group name> [member name1] [member name2] ...\n");
-               return;
-       }
-       
-       fprintf(out_hnd, "SAM Add Domain Group member\n");
-
-       /* open SAMR session.  negotiate credentials */
-       res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
-
-       /* establish a connection. */
-       res = res ? samr_connect(smb_cli, 
-                               srv_name, 0x00000020,
-                               &info->dom.samr_pol_connect) : False;
-
-       /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid1,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       res1 = res ? samr_query_lookup_names(smb_cli,
-                   &info->dom.samr_pol_open_domain, 0x000003e8,
-                   num_names, names,
-                   &num_rids, rid, type) : False;
-
-       if (res1 && num_rids != 0)
-       {
-               group_rid = rid[0];
-       }
-
-       /* connect to the domain */
-       res1 = res1 ? samr_open_group(smb_cli,
-                   &info->dom.samr_pol_open_domain,
-                   0x0000001f, group_rid, &group_pol) : False;
-
-       for (i = 1; i < num_rids && res2 && res1; i++)
-       {
-               res2 = res2 ? samr_add_groupmem(smb_cli, &group_pol, rid[i]) : False;
-
-               if (res2)
-               {
-                       fprintf(out_hnd, "RID added to Group 0x%x: 0x%x\n", group_rid, rid[i]);
-               }
-       }
-
-       res1 = res1 ? samr_close(smb_cli, &group_pol) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_open_domain) : False;
-       res  = res  ? samr_close(smb_cli, &info->dom.samr_pol_connect) : False;
-
-       /* close the session */
-       cli_nt_session_close(smb_cli);
-
-       if (names != NULL)
-       {
-               for (i = 0; i < num_names; i++)
-               {
-                       if (names[i] != NULL)
-                       {
-                               free(((char**)(names))[i]);
-                       }
-               }
-               free(names);
-       }
-       
-       if (res && res1 && res2)
-       {
-               DEBUG(5,("cmd_sam_add_groupmem: succeeded\n"));
-               fprintf(out_hnd, "Add Domain Group Member: OK\n");
-       }
-       else
-       {
-               DEBUG(5,("cmd_sam_add_groupmem: failed\n"));
-               fprintf(out_hnd, "Add Domain Group Member: FAILED\n");
-       }
-}
-
-
-/****************************************************************************
-SAM create domain group.
-****************************************************************************/
-void cmd_sam_create_dom_group(struct client_info *info)
-{
-       fstring srv_name;
-       fstring domain;
-       fstring acct_name;
-       fstring acct_desc;
-       fstring sid;
-       DOM_SID sid1;
-       BOOL res = True;
-       BOOL res1 = True;
-       uint32 flags = 0x220; /* absolutely no idea. */
-       uint32 group_rid; 
-
-       sid_copy(&sid1, &info->dom.level5_sid);
-       sid_to_string(sid, &sid1);
-       fstrcpy(domain, info->dom.level5_dom);
-
-       if (sid1.num_auths == 0)
-       {
-               fprintf(out_hnd, "please use 'lsaquery' first, to ascertain the SID\n");
-               return;
-       }
-
-
-       fstrcpy(srv_name, "\\\\");
-       fstrcat(srv_name, info->dest_host);
-       strupper(srv_name);
-
-       if (!next_token(NULL, acct_name, NULL, sizeof(acct_name)))
-       {
-               fprintf(out_hnd, "creategroup: <acct name> [acct description]\n");
-       }
-
-       if (!next_token(NULL, acct_desc, NULL, sizeof(acct_desc)))
-       {
-               acct_desc[0] = 0;
-       }
-
-
-       fprintf(out_hnd, "SAM Create Domain Group\n");
-       fprintf(out_hnd, "Domain: %s Name: %s Description: %s\n",
-                         domain, acct_name, acct_desc);
-
-       /* open SAMR session.  negotiate credentials */
-       res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
-
-       /* establish a connection. */
-       res = res ? samr_connect(smb_cli, 
-                               srv_name, 0x00000020,
-                               &info->dom.samr_pol_connect) : False;
-
-       /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid1,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       /* read some users */
-       res1 = res ? create_samr_domain_group(smb_cli, 
-                               &info->dom.samr_pol_open_domain,
-                               acct_name, acct_desc, &group_rid) : False;
-
-       res = res ? samr_close(smb_cli,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       res = res ? samr_close(smb_cli,
-                   &info->dom.samr_pol_connect) : False;
-
-       /* close the session */
-       cli_nt_session_close(smb_cli);
-
-       if (res && res1)
-       {
-               DEBUG(5,("cmd_sam_create_dom_group: succeeded\n"));
-               fprintf(out_hnd, "Create Domain Group: OK\n");
-       }
-       else
-       {
-               DEBUG(5,("cmd_sam_create_dom_group: failed\n"));
-               fprintf(out_hnd, "Create Domain Group: FAILED\n");
-       }
-}
-
 
 /****************************************************************************
 experimental SAM users enum.
@@ -1015,49 +181,43 @@ void cmd_sam_enum_users(struct client_info *info)
        fstring domain;
        fstring sid;
        DOM_SID sid1;
-       DOM_SID sid_1_5_20;
        int user_idx;
        BOOL res = True;
-       BOOL res1 = True;
        BOOL request_user_info  = False;
        BOOL request_group_info = False;
-       BOOL request_alias_info = False;
        uint16 num_entries = 0;
        uint16 unk_0 = 0x0;
        uint16 acb_mask = 0;
        uint16 unk_1 = 0x0;
-       uint32 flags = 0x304; /* absolutely no idea. */
+       uint32 admin_rid = 0x304; /* absolutely no idea. */
        fstring tmp;
-       int i;
 
-       sid_copy(&sid1, &info->dom.level5_sid);
-       sid_to_string(sid, &sid1);
+       sid_to_string(sid, &info->dom.level5_sid);
        fstrcpy(domain, info->dom.level5_dom);
 
-       if (sid1.num_auths == 0)
+       if (strlen(sid) == 0)
        {
                fprintf(out_hnd, "please use 'lsaquery' first, to ascertain the SID\n");
                return;
        }
 
+       init_dom_sid(&sid1, sid);
 
        fstrcpy(srv_name, "\\\\");
        fstrcat(srv_name, info->dest_host);
        strupper(srv_name);
 
-       for (i = 0; i < 3; i++)
+       /* a bad way to do token parsing... */
+       if (next_token(NULL, tmp, NULL, sizeof(tmp)))
        {
-               /* a bad way to do token parsing... */
-               if (next_token(NULL, tmp, NULL, sizeof(tmp)))
-               {
-                       request_user_info  |= strequal(tmp, "-u");
-                       request_group_info |= strequal(tmp, "-g");
-                       request_alias_info |= strequal(tmp, "-a");
-               }
-               else
-               {
-                       break;
-               }
+               request_user_info  |= strequal(tmp, "-u");
+               request_group_info |= strequal(tmp, "-g");
+       }
+
+       if (next_token(NULL, tmp, NULL, sizeof(tmp)))
+       {
+               request_user_info  |= strequal(tmp, "-u");
+               request_group_info |= strequal(tmp, "-g");
        }
 
 #ifdef DEBUG_TESTING
@@ -1082,8 +242,6 @@ void cmd_sam_enum_users(struct client_info *info)
        }
 #endif
 
-       string_to_sid(&sid_1_5_20, "S-1-5-32");
-
        fprintf(out_hnd, "SAM Enumerate Users\n");
        fprintf(out_hnd, "From: %s To: %s Domain: %s SID: %s\n",
                          info->myhostname, srv_name, domain, sid);
@@ -1097,24 +255,17 @@ void cmd_sam_enum_users(struct client_info *info)
        res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
 
        /* establish a connection. */
-       res = res ? samr_connect(smb_cli, 
+       res = res ? do_samr_connect(smb_cli, 
                                srv_name, 0x00000020,
                                &info->dom.samr_pol_connect) : False;
 
        /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid1,
+       res = res ? do_samr_open_domain(smb_cli, 
+                   &info->dom.samr_pol_connect, admin_rid, &sid1,
                    &info->dom.samr_pol_open_domain) : False;
 
-       /* connect to the S-1-5-20 domain */
-       res1 = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid_1_5_20,
-                   &info->dom.samr_pol_open_builtindom) : False;
-
-       info->dom.sam = NULL;
-
        /* read some users */
-       res = res ? samr_enum_dom_users(smb_cli, 
+       res = res ? do_samr_enum_dom_users(smb_cli, 
                                &info->dom.samr_pol_open_domain,
                    num_entries, unk_0, acb_mask, unk_1, 0xffff,
                                &info->dom.sam, &info->dom.num_sam_entries) : False;
@@ -1124,10 +275,14 @@ void cmd_sam_enum_users(struct client_info *info)
                fprintf(out_hnd, "No users\n");
        }
 
+       if (request_user_info || request_group_info)
+       {
                /* query all the users */
-       for (user_idx = 0; res && user_idx < info->dom.num_sam_entries; user_idx++)
+               user_idx = 0;
+
+               while (res && user_idx < info->dom.num_sam_entries)
                {
-               uint32 user_rid = info->dom.sam[user_idx].rid;
+                       uint32 user_rid = info->dom.sam[user_idx].smb_userid;
                        SAM_USER_INFO_21 usr;
 
                        fprintf(out_hnd, "User RID: %8x  User Name: %s\n",
@@ -1157,86 +312,20 @@ void cmd_sam_enum_users(struct client_info *info)
                                                        &info->dom.samr_pol_open_domain,
                                                        user_rid, &num_groups, gid))
                                {
-                               uint32 num_names;
-                               uint32  rid_mem[MAX_LOOKUP_SIDS];
-                               fstring name   [MAX_LOOKUP_SIDS];
-                               uint32  type   [MAX_LOOKUP_SIDS];
-
-                               for (i = 0; i < num_groups; i++)
-                               {
-                                       rid_mem[i] = gid[i].g_rid;
-                               }
-
-                               if (samr_query_lookup_rids(smb_cli, 
-                                               &info->dom.samr_pol_open_domain, 0x3e8,
-                                               num_groups, rid_mem, 
-                                               &num_names, name, type))
-                               {
-                                       display_group_members(out_hnd, ACTION_HEADER   , num_names, name, type);
-                                       display_group_members(out_hnd, ACTION_ENUMERATE, num_names, name, type);
-                                       display_group_members(out_hnd, ACTION_FOOTER   , num_names, name, type);
-                               }
-                               }
-                       }
-
-                       if (request_alias_info)
-                       {
-                               uint32 num_aliases;
-                               uint32 rid[LSA_MAX_GROUPS];
-                               DOM_SID als_sid;
-
-                               sid_copy(&als_sid, &sid1);
-                               sid_append_rid(&als_sid, user_rid);
-
-                               /* send user alias query */
-                               if (samr_query_useraliases(smb_cli,
-                                                       &info->dom.samr_pol_open_domain,
-                                                       &als_sid, &num_aliases, rid))
-                               {
-                               uint32 num_names;
-                               fstring name   [MAX_LOOKUP_SIDS];
-                               uint32  type   [MAX_LOOKUP_SIDS];
-
-                               if (samr_query_lookup_rids(smb_cli, 
-                                               &info->dom.samr_pol_open_domain, 0x3e8,
-                                               num_aliases, rid, 
-                                               &num_names, name, type))
-                               {
-                                       display_group_members(out_hnd, ACTION_HEADER   , num_names, name, type);
-                                       display_group_members(out_hnd, ACTION_ENUMERATE, num_names, name, type);
-                                       display_group_members(out_hnd, ACTION_FOOTER   , num_names, name, type);
+                                       display_group_rid_info(out_hnd, ACTION_HEADER   , num_groups, gid);
+                                       display_group_rid_info(out_hnd, ACTION_ENUMERATE, num_groups, gid);
+                                       display_group_rid_info(out_hnd, ACTION_FOOTER   , num_groups, gid);
                                }
                        }
 
-                       /* send user alias query */
-                       if (res1 && samr_query_useraliases(smb_cli,
-                                               &info->dom.samr_pol_open_builtindom,
-                                               &als_sid, &num_aliases, rid))
-                       {
-                               uint32 num_names;
-                               fstring name   [MAX_LOOKUP_SIDS];
-                               uint32  type   [MAX_LOOKUP_SIDS];
-
-                               if (samr_query_lookup_rids(smb_cli, 
-                                               &info->dom.samr_pol_open_builtindom, 0x3e8,
-                                               num_aliases, rid, 
-                                               &num_names, name, type))
-                               {
-                                       display_group_members(out_hnd, ACTION_HEADER   , num_names, name, type);
-                                       display_group_members(out_hnd, ACTION_ENUMERATE, num_names, name, type);
-                                       display_group_members(out_hnd, ACTION_FOOTER   , num_names, name, type);
-                               }
-                       }
+                       user_idx++;
                }
        }
 
-       res1 = res1 ? samr_close(smb_cli,
-                   &info->dom.samr_pol_open_builtindom) : False;
-
-       res = res ? samr_close(smb_cli,
+       res = res ? do_samr_close(smb_cli,
                    &info->dom.samr_pol_open_domain) : False;
 
-       res = res ? samr_close(smb_cli,
+       res = res ? do_samr_close(smb_cli,
                    &info->dom.samr_pol_connect) : False;
 
        /* close the session */
@@ -1269,7 +358,7 @@ void cmd_sam_query_user(struct client_info *info)
        DOM_SID sid1;
        int user_idx = 0;  /* FIXME maybe ... */
        BOOL res = True;
-       uint32 flags = 0x304; /* absolutely no idea. */
+       uint32 admin_rid = 0x304; /* absolutely no idea. */
        fstring rid_str ;
        fstring info_str;
        uint32 user_rid = 0;
@@ -1286,7 +375,7 @@ void cmd_sam_query_user(struct client_info *info)
                return;
        }
 
-       string_to_sid(&sid1, sid);
+       init_dom_sid(&sid1, sid);
 
        fstrcpy(srv_name, "\\\\");
        fstrcat(srv_name, info->dest_host);
@@ -1295,8 +384,8 @@ void cmd_sam_query_user(struct client_info *info)
        if (next_token(NULL, rid_str , NULL, sizeof(rid_str )) &&
            next_token(NULL, info_str, NULL, sizeof(info_str)))
        {
-               user_rid   = strtoul(rid_str , (char**)NULL, 16);
-               info_level = strtoul(info_str, (char**)NULL, 10);
+               user_rid   = (uint32)strtol(rid_str , (char**)NULL, 16);
+               info_level = (uint32)strtol(info_str, (char**)NULL, 10);
        }
 
        fprintf(out_hnd, "SAM Query User: rid %x info level %d\n",
@@ -1308,13 +397,13 @@ void cmd_sam_query_user(struct client_info *info)
        res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
 
        /* establish a connection. */
-       res = res ? samr_connect(smb_cli,
+       res = res ? do_samr_connect(smb_cli,
                                srv_name, 0x00000020,
                                &info->dom.samr_pol_connect) : False;
 
        /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli,
-                   &info->dom.samr_pol_connect, flags, &sid1,
+       res = res ? do_samr_open_domain(smb_cli,
+                   &info->dom.samr_pol_connect, admin_rid, &sid1,
                    &info->dom.samr_pol_open_domain) : False;
 
        fprintf(out_hnd, "User RID: %8x  User Name: %s\n",
@@ -1334,10 +423,10 @@ void cmd_sam_query_user(struct client_info *info)
                }
        }
 
-       res = res ? samr_close(smb_cli,
+       res = res ? do_samr_close(smb_cli,
                    &info->dom.samr_pol_connect) : False;
 
-       res = res ? samr_close(smb_cli,
+       res = res ? do_samr_close(smb_cli,
                    &info->dom.samr_pol_open_domain) : False;
 
        /* close the session */
@@ -1355,9 +444,9 @@ void cmd_sam_query_user(struct client_info *info)
 
 
 /****************************************************************************
-experimental SAM domain info query.
+experimental SAM groups query.
 ****************************************************************************/
-void cmd_sam_query_dominfo(struct client_info *info)
+void cmd_sam_query_groups(struct client_info *info)
 {
        fstring srv_name;
        fstring domain;
@@ -1366,7 +455,7 @@ void cmd_sam_query_dominfo(struct client_info *info)
        BOOL res = True;
        fstring info_str;
        uint32 switch_value = 2;
-       uint32 flags = 0x304; /* absolutely no idea. */
+       uint32 admin_rid = 0x304; /* absolutely no idea. */
 
        sid_to_string(sid, &info->dom.level5_sid);
        fstrcpy(domain, info->dom.level5_dom);
@@ -1377,7 +466,7 @@ void cmd_sam_query_dominfo(struct client_info *info)
                return;
        }
 
-       string_to_sid(&sid1, sid);
+       init_dom_sid(&sid1, sid);
 
        fstrcpy(srv_name, "\\\\");
        fstrcat(srv_name, info->dest_host);
@@ -1385,10 +474,10 @@ void cmd_sam_query_dominfo(struct client_info *info)
 
        if (next_token(NULL, info_str, NULL, sizeof(info_str)))
        {
-               switch_value = strtoul(info_str, (char**)NULL, 10);
+               switch_value = (uint32)strtol(info_str, (char**)NULL, 10);
        }
 
-       fprintf(out_hnd, "SAM Query Domain Info: info level %d\n", switch_value);
+       fprintf(out_hnd, "SAM Query Groups: info level %d\n", switch_value);
        fprintf(out_hnd, "From: %s To: %s Domain: %s SID: %s\n",
                          info->myhostname, srv_name, domain, sid);
 
@@ -1396,23 +485,23 @@ void cmd_sam_query_dominfo(struct client_info *info)
        res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
 
        /* establish a connection. */
-       res = res ? samr_connect(smb_cli, 
+       res = res ? do_samr_connect(smb_cli, 
                                srv_name, 0x00000020,
                                &info->dom.samr_pol_connect) : False;
 
        /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli, 
-                   &info->dom.samr_pol_connect, flags, &sid1,
+       res = res ? do_samr_open_domain(smb_cli, 
+                   &info->dom.samr_pol_connect, admin_rid, &sid1,
                    &info->dom.samr_pol_open_domain) : False;
 
        /* send a samr 0x8 command */
-       res = res ? samr_query_dom_info(smb_cli,
+       res = res ? do_samr_query_dom_info(smb_cli,
                    &info->dom.samr_pol_open_domain, switch_value) : False;
 
-       res = res ? samr_close(smb_cli,
+       res = res ? do_samr_close(smb_cli,
                    &info->dom.samr_pol_connect) : False;
 
-       res = res ? samr_close(smb_cli, 
+       res = res ? do_samr_close(smb_cli, 
                    &info->dom.samr_pol_open_domain) : False;
 
        /* close the session */
@@ -1420,11 +509,11 @@ void cmd_sam_query_dominfo(struct client_info *info)
 
        if (res)
        {
-               DEBUG(5,("cmd_sam_query_dominfo: succeeded\n"));
+               DEBUG(5,("cmd_sam_query_groups: succeeded\n"));
        }
        else
        {
-               DEBUG(5,("cmd_sam_query_dominfo: failed\n"));
+               DEBUG(5,("cmd_sam_query_groups: failed\n"));
        }
 }
 
@@ -1439,10 +528,15 @@ void cmd_sam_enum_aliases(struct client_info *info)
        fstring sid;
        DOM_SID sid1;
        BOOL res = True;
-       BOOL request_member_info = False;
-       uint32 flags = 0x200003f3; /* absolutely no idea. */
+       BOOL request_user_info  = False;
+       BOOL request_alias_info = False;
+       uint32 admin_rid = 0x304; /* absolutely no idea. */
        fstring tmp;
-       uint32 alias_idx;
+
+       uint32 num_aliases = 3;
+       uint32 alias_rid[3] = { DOMAIN_GROUP_RID_ADMINS, DOMAIN_GROUP_RID_USERS, DOMAIN_GROUP_RID_GUESTS };
+       fstring alias_names [3];
+       uint32  num_als_usrs[3];
 
        sid_to_string(sid, &info->dom.level3_sid);
        fstrcpy(domain, info->dom.level3_dom);
@@ -1455,7 +549,7 @@ void cmd_sam_enum_aliases(struct client_info *info)
                return;
        }
 
-       string_to_sid(&sid1, sid);
+       init_dom_sid(&sid1, sid);
 
        fstrcpy(srv_name, "\\\\");
        fstrcat(srv_name, info->dest_host);
@@ -1464,7 +558,14 @@ void cmd_sam_enum_aliases(struct client_info *info)
        /* a bad way to do token parsing... */
        if (next_token(NULL, tmp, NULL, sizeof(tmp)))
        {
-               request_member_info |= strequal(tmp, "-m");
+               request_user_info  |= strequal(tmp, "-u");
+               request_alias_info |= strequal(tmp, "-g");
+       }
+
+       if (next_token(NULL, tmp, NULL, sizeof(tmp)))
+       {
+               request_user_info  |= strequal(tmp, "-u");
+               request_alias_info |= strequal(tmp, "-g");
        }
 
        fprintf(out_hnd, "SAM Enumerate Aliases\n");
@@ -1475,262 +576,104 @@ void cmd_sam_enum_aliases(struct client_info *info)
        res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
 
        /* establish a connection. */
-       res = res ? samr_connect(smb_cli,
+       res = res ? do_samr_connect(smb_cli,
                                srv_name, 0x00000020,
                                &info->dom.samr_pol_connect) : False;
 
        /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli,
-                   &info->dom.samr_pol_connect, flags, &sid1,
+       res = res ? do_samr_open_domain(smb_cli,
+                   &info->dom.samr_pol_connect, admin_rid, &sid1,
                    &info->dom.samr_pol_open_domain) : False;
 
-       info->dom.sam = NULL;
-
-       /* read some aliases */
-       res = res ? samr_enum_dom_aliases(smb_cli,
-                               &info->dom.samr_pol_open_domain,
-                               0xffff,
-                               &info->dom.sam, &info->dom.num_sam_entries) : False;
+       /* send a query on the aliase */
+       res = res ? do_samr_query_unknown_12(smb_cli,
+                   &info->dom.samr_pol_open_domain, admin_rid, num_aliases, alias_rid,
+                   &num_aliases, alias_names, num_als_usrs) : False;
 
-       if (res && info->dom.num_sam_entries == 0)
+       if (res)
        {
-               fprintf(out_hnd, "No aliases\n");
+               display_alias_name_info(out_hnd, ACTION_HEADER   , num_aliases, alias_names, num_als_usrs);
+               display_alias_name_info(out_hnd, ACTION_ENUMERATE, num_aliases, alias_names, num_als_usrs);
+               display_alias_name_info(out_hnd, ACTION_FOOTER   , num_aliases, alias_names, num_als_usrs);
        }
 
+#if 0
 
-       for (alias_idx = 0; alias_idx < info->dom.num_sam_entries; alias_idx++)
-       {
-               uint32 alias_rid = info->dom.sam[alias_idx].rid;
-
-               fprintf(out_hnd, "Alias RID: %8x  Group Name: %s\n",
-                                 alias_rid,
-                                 info->dom.sam[alias_idx].acct_name);
-
-               if (request_member_info)
-               {
-                       uint32 num_aliases;
-                       DOM_SID2 sid_mem[MAX_LOOKUP_SIDS];
-
-                       /* send user aliases query */
-                       if (get_samr_query_aliasmem(smb_cli, 
+       /* read some users */
+       res = res ? do_samr_enum_dom_users(smb_cli,
                                &info->dom.samr_pol_open_domain,
-                                               alias_rid, &num_aliases, sid_mem))
-                       {
-                               BOOL res3 = True;
-                               BOOL res4 = True;
-                               char **names = NULL;
-                               int num_names = 0;
-                               DOM_SID **sids = NULL;
-                               int i;
-
-                               uint16 old_fnum = smb_cli->nt_pipe_fnum;
-
-                               if (num_aliases != 0)
-                               {
-                                       sids = malloc(num_aliases * sizeof(DOM_SID*));
-                               }
-
-                               res3 = sids != NULL;
-                               if (res3)
-                               {
-                                       for (i = 0; i < num_aliases; i++)
-                                       {
-                                               sids[i] = &sid_mem[i].sid;
-                                       }
-                               }
-
-                               /* open LSARPC session. */
-                               res3 = res3 ? cli_nt_session_open(smb_cli, PIPE_LSARPC) : False;
-
-                               /* lookup domain controller; receive a policy handle */
-                               res3 = res3 ? lsa_open_policy(smb_cli,
-                                                       srv_name,
-                                                       &info->dom.lsa_info_pol, True) : False;
+                   num_entries, unk_0, acb_mask, unk_1, 0xffff,
+                               info->dom.sam, &info->dom.num_sam_entries) : False;
 
-                               /* send lsa lookup sids call */
-                               res4 = res3 ? lsa_lookup_sids(smb_cli, 
-                                                              &info->dom.lsa_info_pol,
-                                                              num_aliases, sids, 
-                                                              &names, &num_names) : False;
+       if (res && info->dom.num_sam_entries == 0)
+       {
+               fprintf(out_hnd, "No users\n");
+       }
 
-                               res3 = res3 ? lsa_close(smb_cli, &info->dom.lsa_info_pol) : False;
+       if (request_user_info || request_alias_info)
+       {
+               /* query all the users */
+               user_idx = 0;
 
-                               cli_nt_session_close(smb_cli);
+               while (res && user_idx < info->dom.num_sam_entries)
+               {
+                       uint32 user_rid = info->dom.sam[user_idx].smb_userid;
+                       SAM_USER_INFO_21 usr;
 
-                               smb_cli->nt_pipe_fnum = old_fnum;
+                       fprintf(out_hnd, "User RID: %8x  User Name: %s\n",
+                                         user_rid,
+                                         info->dom.sam[user_idx].acct_name);
 
-                               if (res4 && names != NULL)
-                               {
-                                       display_alias_members(out_hnd, ACTION_HEADER   , num_names, names);
-                                       display_alias_members(out_hnd, ACTION_ENUMERATE, num_names, names);
-                                       display_alias_members(out_hnd, ACTION_FOOTER   , num_names, names);
-                               }
-                               if (names != NULL)
-                               {
-                                       for (i = 0; i < num_names; i++)
-                                       {
-                                               if (names[i] != NULL)
-                                               {
-                                                       free(names[i]);
-                                               }
-                                       }
-                                       free(names);
-                               }
-                               if (sids != NULL)
+                       if (request_user_info)
+                       {
+                               /* send user info query, level 0x15 */
+                               if (get_samr_query_userinfo(smb_cli,
+                                                       &info->dom.samr_pol_open_domain,
+                                                       0x15, user_rid, &usr))
                                {
-                                       free(sids);
+                                       display_sam_user_info_21(out_hnd, ACTION_HEADER   , &usr);
+                                       display_sam_user_info_21(out_hnd, ACTION_ENUMERATE, &usr);
+                                       display_sam_user_info_21(out_hnd, ACTION_FOOTER   , &usr);
                                }
                        }
-               }
-       }
-
-       res = res ? samr_close(smb_cli, 
-                   &info->dom.samr_pol_connect) : False;
 
-       res = res ? samr_close(smb_cli,
-                   &info->dom.samr_pol_open_domain) : False;
-
-       /* close the session */
-       cli_nt_session_close(smb_cli);
-
-       if (info->dom.sam != NULL)
+                       if (request_alias_info)
                        {
-               free(info->dom.sam);
-       }
+                               uint32 num_aliases;
+                               DOM_GID gid[LSA_MAX_GROUPS];
 
-       if (res)
-       {
-               DEBUG(5,("cmd_sam_enum_aliases: succeeded\n"));
-       }
-       else
+                               /* send user aliase query */
+                               if (get_samr_query_useraliases(smb_cli, 
+                                                       &info->dom.samr_pol_open_domain,
+                                                       user_rid, &num_aliases, gid))
                                {
-               DEBUG(5,("cmd_sam_enum_aliases: failed\n"));
+                                       display_alias_info(out_hnd, ACTION_HEADER   , num_aliases, gid);
+                                       display_alias_info(out_hnd, ACTION_ENUMERATE, num_aliases, gid);
+                                       display_alias_info(out_hnd, ACTION_FOOTER   , num_aliases, gid);
                                }
                        }
 
-
-/****************************************************************************
-experimental SAM groups query.
-****************************************************************************/
-void cmd_sam_enum_groups(struct client_info *info)
-{
-       fstring srv_name;
-       fstring domain;
-       fstring sid;
-       DOM_SID sid1;
-       BOOL res = True;
-       BOOL request_member_info = False;
-       uint32 flags = 0x304; /* absolutely no idea. */
-       fstring tmp;
-       uint32 group_idx;
-
-       sid_to_string(sid, &info->dom.level3_sid);
-       fstrcpy(domain, info->dom.level3_dom);
-#if 0
-       fstrcpy(sid   , "S-1-5-20");
-#endif
-       if (strlen(sid) == 0)
-       {
-               fprintf(out_hnd, "please use 'lsaquery' first, to ascertain the SID\n");
-               return;
+                       user_idx++;
                }
-
-       string_to_sid(&sid1, sid);
-
-       fstrcpy(srv_name, "\\\\");
-       fstrcat(srv_name, info->dest_host);
-       strupper(srv_name);
-
-       /* a bad way to do token parsing... */
-       if (next_token(NULL, tmp, NULL, sizeof(tmp)))
-       {
-               request_member_info |= strequal(tmp, "-m");
        }
+#endif
 
-       fprintf(out_hnd, "SAM Enumerate Groups\n");
-       fprintf(out_hnd, "From: %s To: %s Domain: %s SID: %s\n",
-                         info->myhostname, srv_name, domain, sid);
-
-       /* open SAMR session.  negotiate credentials */
-       res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR) : False;
-
-       /* establish a connection. */
-       res = res ? samr_connect(smb_cli,
-                               srv_name, 0x00000020,
+       res = res ? do_samr_close(smb_cli, 
                    &info->dom.samr_pol_connect) : False;
 
-       /* connect to the domain */
-       res = res ? samr_open_domain(smb_cli,
-                   &info->dom.samr_pol_connect, flags, &sid1,
+       res = res ? do_samr_close(smb_cli,
                    &info->dom.samr_pol_open_domain) : False;
 
-       info->dom.sam = NULL;
-
-       /* read some groups */
-       res = res ? samr_enum_dom_groups(smb_cli,
-                               &info->dom.samr_pol_open_domain,
-                               0xffff,
-                               &info->dom.sam, &info->dom.num_sam_entries) : False;
-
-       if (res && info->dom.num_sam_entries == 0)
-       {
-               fprintf(out_hnd, "No groups\n");
-       }
-
-
-       for (group_idx = 0; group_idx < info->dom.num_sam_entries; group_idx++)
-       {
-               uint32 group_rid = info->dom.sam[group_idx].rid;
-
-               fprintf(out_hnd, "Group RID: %8x  Group Name: %s Description: %s\n",
-                                 group_rid,
-                                 info->dom.sam[group_idx].acct_name,
-                                 info->dom.sam[group_idx].acct_desc);
-
-               if (request_member_info)
-               {
-                       uint32 num_groups;
-                       uint32 num_names;
-                       uint32 attr_mem[MAX_LOOKUP_SIDS];
-                       uint32 rid_mem [MAX_LOOKUP_SIDS];
-                       fstring name[MAX_LOOKUP_SIDS];
-                       uint32  type[MAX_LOOKUP_SIDS];
-
-                       /* send user groups query */
-                       if (get_samr_query_groupmem(smb_cli, 
-                                               &info->dom.samr_pol_open_domain,
-                                               group_rid, &num_groups,
-                                               rid_mem, attr_mem) &&
-                           samr_query_lookup_rids(smb_cli, 
-                                               &info->dom.samr_pol_open_domain, 0x3e8,
-                                               num_groups, rid_mem, 
-                                               &num_names, name, type))
-                       {
-                               display_group_members(out_hnd, ACTION_HEADER   , num_names, name, type);
-                               display_group_members(out_hnd, ACTION_ENUMERATE, num_names, name, type);
-                               display_group_members(out_hnd, ACTION_FOOTER   , num_names, name, type);
-                       }
-               }
-       }
-
-       res = res ? samr_close(smb_cli, &info->dom.samr_pol_connect) : False;
-       res = res ? samr_close(smb_cli, &info->dom.samr_pol_open_domain) : False;
-
        /* close the session */
        cli_nt_session_close(smb_cli);
 
-       if (info->dom.sam != NULL)
-       {
-               free(info->dom.sam);
-       }
-
        if (res)
        {
-               DEBUG(5,("cmd_sam_enum_groups: succeeded\n"));
+               DEBUG(5,("cmd_sam_enum_users: succeeded\n"));
        }
        else
        {
-               DEBUG(5,("cmd_sam_enum_groups: failed\n"));
+               DEBUG(5,("cmd_sam_enum_users: failed\n"));
        }
 }