From cf0ea874b1a7cb1dcaaea159d9a4a8a5deae1310 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Fri, 4 Dec 1998 16:30:00 +0000 Subject: - renamed do_samr_xxx to samr_xxx - renamed do_lsa_xxx to lsa_xxx - added "enumgroups [-m]" command, enumerates groups, shows members. - added cmd_sam_add_groupmem(), need to call these in rpcclient.c - added cmd_sam_add_aliasmem(), need to call these in rpcclient.c - modified "enumaliases [-m]" command - improved "enumgroups" and "enumaliases" to display names not just RIDS/SIDs. - renamed "samr_unknown_12" to "samr_lookup_rids". - added the following client-side functions: get_samr_query_groupmem() get_samr_query_aliasmem() get_samr_query_groupinfo() samr_enum_dom_groups() samr_enum_dom_aliases() samr_add_aliasmem() samr_add_groupmem() - improved display output (display.c) (This used to be commit eacc5e581af2b4de24186b9be3238b352c54effe) --- source3/rpcclient/cmd_lsarpc.c | 20 +- source3/rpcclient/cmd_samr.c | 564 ++++++++++++++++++++++++++++++++++------- source3/rpcclient/display.c | 244 ++++++++++++++---- source3/rpcclient/rpcclient.c | 4 +- 4 files changed, 669 insertions(+), 163 deletions(-) (limited to 'source3/rpcclient') diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c index 83d2e40af4..c222d0a0e0 100644 --- a/source3/rpcclient/cmd_lsarpc.c +++ b/source3/rpcclient/cmd_lsarpc.c @@ -65,23 +65,23 @@ void cmd_lsa_query_info(struct client_info *info) res = res ? cli_nt_session_open(smb_cli, PIPE_LSARPC) : False; /* lookup domain controller; receive a policy handle */ - res = res ? do_lsa_open_policy(smb_cli, + res = res ? lsa_open_policy(smb_cli, srv_name, &info->dom.lsa_info_pol, False) : False; /* send client info query, level 3. receive domain name and sid */ - res = res ? do_lsa_query_info_pol(smb_cli, + res = res ? lsa_query_info_pol(smb_cli, &info->dom.lsa_info_pol, 0x03, info->dom.level3_dom, &info->dom.level3_sid) : False; /* send client info query, level 5. receive domain name and sid */ - res = res ? do_lsa_query_info_pol(smb_cli, + res = res ? lsa_query_info_pol(smb_cli, &info->dom.lsa_info_pol, 0x05, info->dom.level5_dom, &info->dom.level5_sid) : False; - res = res ? do_lsa_close(smb_cli, &info->dom.lsa_info_pol) : False; + res = res ? lsa_close(smb_cli, &info->dom.lsa_info_pol) : False; /* close the session */ cli_nt_session_close(smb_cli); @@ -160,17 +160,17 @@ void cmd_lsa_lookup_names(struct client_info *info) res = res ? cli_nt_session_open(smb_cli, PIPE_LSARPC) : False; /* lookup domain controller; receive a policy handle */ - res = res ? do_lsa_open_policy(smb_cli, + res = res ? lsa_open_policy(smb_cli, srv_name, &info->dom.lsa_info_pol, True) : False; /* send lsa lookup sids call */ - res = res ? do_lsa_lookup_names(smb_cli, + res = res ? lsa_lookup_names(smb_cli, &info->dom.lsa_info_pol, num_names, names, &sids, &num_sids) : False; - res = res ? do_lsa_close(smb_cli, &info->dom.lsa_info_pol) : False; + res = res ? lsa_close(smb_cli, &info->dom.lsa_info_pol) : False; /* close the session */ cli_nt_session_close(smb_cli); @@ -267,17 +267,17 @@ void cmd_lsa_lookup_sids(struct client_info *info) res = res ? cli_nt_session_open(smb_cli, PIPE_LSARPC) : False; /* lookup domain controller; receive a policy handle */ - res = res ? do_lsa_open_policy(smb_cli, + res = res ? lsa_open_policy(smb_cli, srv_name, &info->dom.lsa_info_pol, True) : False; /* send lsa lookup sids call */ - res = res ? do_lsa_lookup_sids(smb_cli, + res = res ? lsa_lookup_sids(smb_cli, &info->dom.lsa_info_pol, num_sids, sids, &names, &num_names) : False; - res = res ? do_lsa_close(smb_cli, &info->dom.lsa_info_pol) : False; + res = res ? lsa_close(smb_cli, &info->dom.lsa_info_pol) : False; /* close the session */ cli_nt_session_close(smb_cli); diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index a1ff0519f7..13e0829613 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -171,6 +171,97 @@ void cmd_sam_test(struct client_info *info) } } +/**************************************************************************** +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; + 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, "addaliasmem: [member sid1] [member sid2] ...\n"); + return; + } + alias_rid = strtoul(tmp, (char**)NULL, 10); + + fprintf(out_hnd, "SAM Create 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; + + /* connect to the domain */ + res1 = res ? samr_open_alias(smb_cli, + &info->dom.samr_pol_open_domain, + alias_rid, &alias_pol) : False; + + while (next_token(NULL, tmp, NULL, sizeof(tmp)) && res2 && res1) + { + /* get a sid, add a member to the alias */ + res2 = res2 ? string_to_sid(&member_sid, tmp) : False; + res2 = res2 ? samr_add_aliasmem(smb_cli, &alias_pol, &member_sid) : False; + + if (res2) + { + 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 (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. ****************************************************************************/ @@ -184,7 +275,7 @@ void cmd_sam_create_dom_alias(struct client_info *info) DOM_SID sid1; BOOL res = True; BOOL res1 = True; - uint32 admin_rid = 0x200003f3; /* absolutely no idea. */ + uint32 flags = 0x200003f3; /* absolutely no idea. */ uint32 alias_rid; sid_copy(&sid1, &info->dom.level5_sid); @@ -227,10 +318,10 @@ void cmd_sam_create_dom_alias(struct client_info *info) /* connect to the domain */ res = res ? samr_open_domain(smb_cli, - &info->dom.samr_pol_connect, admin_rid, &sid1, + &info->dom.samr_pol_connect, flags, &sid1, &info->dom.samr_pol_open_domain) : False; - /* read some users */ + /* 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; @@ -257,6 +348,97 @@ void cmd_sam_create_dom_alias(struct client_info *info) } +/**************************************************************************** +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 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, "addgroupmem: [member rid1] [member rid2] ...\n"); + return; + } + group_rid = strtoul(tmp, (char**)NULL, 10); + + fprintf(out_hnd, "SAM Create 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; + + /* connect to the domain */ + res1 = res ? samr_open_group(smb_cli, + &info->dom.samr_pol_open_domain, + group_rid, &group_pol) : False; + + while (next_token(NULL, tmp, NULL, sizeof(tmp)) && res2 && res1) + { + /* get a rid, add a member to the group */ + member_rid = get_number(tmp); + res2 = res2 ? samr_add_groupmem(smb_cli, &group_pol, member_rid) : False; + + if (res2) + { + fprintf(out_hnd, "RID added to 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_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. ****************************************************************************/ @@ -270,7 +452,7 @@ void cmd_sam_create_dom_group(struct client_info *info) DOM_SID sid1; BOOL res = True; BOOL res1 = True; - uint32 admin_rid = 0x220; /* absolutely no idea. */ + uint32 flags = 0x220; /* absolutely no idea. */ uint32 group_rid; sid_copy(&sid1, &info->dom.level5_sid); @@ -313,7 +495,7 @@ void cmd_sam_create_dom_group(struct client_info *info) /* connect to the domain */ res = res ? samr_open_domain(smb_cli, - &info->dom.samr_pol_connect, admin_rid, &sid1, + &info->dom.samr_pol_connect, flags, &sid1, &info->dom.samr_pol_open_domain) : False; /* read some users */ @@ -363,7 +545,7 @@ void cmd_sam_enum_users(struct client_info *info) uint16 unk_0 = 0x0; uint16 acb_mask = 0; uint16 unk_1 = 0x0; - uint32 admin_rid = 0x304; /* absolutely no idea. */ + uint32 flags = 0x304; /* absolutely no idea. */ fstring tmp; int i; @@ -440,14 +622,16 @@ void cmd_sam_enum_users(struct client_info *info) /* connect to the domain */ res = res ? samr_open_domain(smb_cli, - &info->dom.samr_pol_connect, admin_rid, &sid1, + &info->dom.samr_pol_connect, flags, &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, admin_rid, &sid_1_5_20, + &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, &info->dom.samr_pol_open_domain, @@ -462,7 +646,7 @@ void cmd_sam_enum_users(struct client_info *info) /* query all the users */ for (user_idx = 0; res && user_idx < info->dom.num_sam_entries; user_idx++) { - uint32 user_rid = info->dom.sam[user_idx].user_rid; + uint32 user_rid = info->dom.sam[user_idx].rid; SAM_USER_INFO_21 usr; fprintf(out_hnd, "User RID: %8x User Name: %s\n", @@ -492,9 +676,25 @@ void cmd_sam_enum_users(struct client_info *info) &info->dom.samr_pol_open_domain, user_rid, &num_groups, gid)) { - 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); + 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); + } } } @@ -512,9 +712,19 @@ void cmd_sam_enum_users(struct client_info *info) &info->dom.samr_pol_open_domain, &als_sid, &num_aliases, rid)) { - display_alias_rid_info(out_hnd, ACTION_HEADER , &sid1, num_aliases, rid); - display_alias_rid_info(out_hnd, ACTION_ENUMERATE, &sid1, num_aliases, rid); - display_alias_rid_info(out_hnd, ACTION_FOOTER , &sid1, 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); + } } /* send user alias query */ @@ -522,9 +732,19 @@ void cmd_sam_enum_users(struct client_info *info) &info->dom.samr_pol_open_builtindom, &als_sid, &num_aliases, rid)) { - display_alias_rid_info(out_hnd, ACTION_HEADER , &sid_1_5_20, num_aliases, rid); - display_alias_rid_info(out_hnd, ACTION_ENUMERATE, &sid_1_5_20, num_aliases, rid); - display_alias_rid_info(out_hnd, ACTION_FOOTER , &sid_1_5_20, 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); + } } } } @@ -568,7 +788,7 @@ void cmd_sam_query_user(struct client_info *info) DOM_SID sid1; int user_idx = 0; /* FIXME maybe ... */ BOOL res = True; - uint32 admin_rid = 0x304; /* absolutely no idea. */ + uint32 flags = 0x304; /* absolutely no idea. */ fstring rid_str ; fstring info_str; uint32 user_rid = 0; @@ -594,8 +814,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 = (uint32)strtol(rid_str , (char**)NULL, 16); - info_level = (uint32)strtol(info_str, (char**)NULL, 10); + user_rid = strtoul(rid_str , (char**)NULL, 16); + info_level = strtoul(info_str, (char**)NULL, 10); } fprintf(out_hnd, "SAM Query User: rid %x info level %d\n", @@ -613,7 +833,7 @@ void cmd_sam_query_user(struct client_info *info) /* connect to the domain */ res = res ? samr_open_domain(smb_cli, - &info->dom.samr_pol_connect, admin_rid, &sid1, + &info->dom.samr_pol_connect, flags, &sid1, &info->dom.samr_pol_open_domain) : False; fprintf(out_hnd, "User RID: %8x User Name: %s\n", @@ -654,9 +874,9 @@ void cmd_sam_query_user(struct client_info *info) /**************************************************************************** -experimental SAM groups query. +experimental SAM domain info query. ****************************************************************************/ -void cmd_sam_query_groups(struct client_info *info) +void cmd_sam_query_dominfo(struct client_info *info) { fstring srv_name; fstring domain; @@ -665,7 +885,7 @@ void cmd_sam_query_groups(struct client_info *info) BOOL res = True; fstring info_str; uint32 switch_value = 2; - uint32 admin_rid = 0x304; /* absolutely no idea. */ + uint32 flags = 0x304; /* absolutely no idea. */ sid_to_string(sid, &info->dom.level5_sid); fstrcpy(domain, info->dom.level5_dom); @@ -684,10 +904,10 @@ void cmd_sam_query_groups(struct client_info *info) if (next_token(NULL, info_str, NULL, sizeof(info_str))) { - switch_value = (uint32)strtol(info_str, (char**)NULL, 10); + switch_value = strtoul(info_str, (char**)NULL, 10); } - fprintf(out_hnd, "SAM Query Groups: info level %d\n", switch_value); + fprintf(out_hnd, "SAM Query Domain Info: info level %d\n", switch_value); fprintf(out_hnd, "From: %s To: %s Domain: %s SID: %s\n", info->myhostname, srv_name, domain, sid); @@ -701,7 +921,7 @@ void cmd_sam_query_groups(struct client_info *info) /* connect to the domain */ res = res ? samr_open_domain(smb_cli, - &info->dom.samr_pol_connect, admin_rid, &sid1, + &info->dom.samr_pol_connect, flags, &sid1, &info->dom.samr_pol_open_domain) : False; /* send a samr 0x8 command */ @@ -719,11 +939,11 @@ void cmd_sam_query_groups(struct client_info *info) if (res) { - DEBUG(5,("cmd_sam_query_groups: succeeded\n")); + DEBUG(5,("cmd_sam_query_dominfo: succeeded\n")); } else { - DEBUG(5,("cmd_sam_query_groups: failed\n")); + DEBUG(5,("cmd_sam_query_dominfo: failed\n")); } } @@ -738,15 +958,10 @@ void cmd_sam_enum_aliases(struct client_info *info) fstring sid; DOM_SID sid1; BOOL res = True; - BOOL request_user_info = False; - BOOL request_alias_info = False; - uint32 admin_rid = 0x304; /* absolutely no idea. */ + BOOL request_member_info = False; + uint32 flags = 0x304; /* absolutely no idea. */ fstring tmp; - - 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]; + uint32 alias_idx; sid_to_string(sid, &info->dom.level3_sid); fstrcpy(domain, info->dom.level3_dom); @@ -768,14 +983,7 @@ 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_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"); + request_member_info |= strequal(tmp, "-m"); } fprintf(out_hnd, "SAM Enumerate Aliases\n"); @@ -792,98 +1000,260 @@ void cmd_sam_enum_aliases(struct client_info *info) /* connect to the domain */ res = res ? samr_open_domain(smb_cli, - &info->dom.samr_pol_connect, admin_rid, &sid1, + &info->dom.samr_pol_connect, flags, &sid1, &info->dom.samr_pol_open_domain) : False; - /* send a query on the aliases */ - res = res ? 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; + info->dom.sam = NULL; - if (res) + /* 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; + + if (res && info->dom.num_sam_entries == 0) { - 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); + fprintf(out_hnd, "No aliases\n"); } -#if 0 - /* read some users */ - res = res ? 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; + for (alias_idx = 0; alias_idx < info->dom.num_sam_entries; alias_idx++) + { + uint32 alias_rid = info->dom.sam[alias_idx].rid; - if (res && info->dom.num_sam_entries == 0) + 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, + &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; + + /* jeremy, you removed all the independent fnums + * i put into the nt client code. this is the reason + * why they are all needed. + */ + uint16 old_fnum = smb_cli->nt_pipe_fnum; + + if (num_aliases != 0) { - fprintf(out_hnd, "No users\n"); + sids = malloc(num_aliases * sizeof(DOM_SID*)); } - if (request_user_info || request_alias_info) + res3 = sids != NULL; + if (res3) { - /* query all the users */ - user_idx = 0; - - while (res && user_idx < info->dom.num_sam_entries) + for (i = 0; i < num_aliases; i++) { - uint32 user_rid = info->dom.sam[user_idx].user_rid; - SAM_USER_INFO_21 usr; + sids[i] = &sid_mem[i].sid; + } + } - fprintf(out_hnd, "User RID: %8x User Name: %s\n", - user_rid, - info->dom.sam[user_idx].acct_name); + /* open LSARPC session. */ + res3 = res3 ? cli_nt_session_open(smb_cli, PIPE_LSARPC) : False; - if (request_user_info) + /* 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_sids(smb_cli, + &info->dom.lsa_info_pol, + num_aliases, sids, + &names, &num_names) : False; + + res3 = res3 ? lsa_close(smb_cli, &info->dom.lsa_info_pol) : False; + + cli_nt_session_close(smb_cli); + + smb_cli->nt_pipe_fnum = old_fnum; + + if (res4 && names != NULL) { - /* send user info query, level 0x15 */ - if (get_samr_query_userinfo(smb_cli, - &info->dom.samr_pol_open_domain, - 0x15, user_rid, &usr)) + 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) { - 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); + for (i = 0; i < num_names; i++) + { + if (names[i] != NULL) + { + free(names[i]); + } + } + free(names); + } + if (sids != NULL) + { + free(sids); + } + } } } - if (request_alias_info) + 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) { - uint32 num_aliases; - DOM_GID gid[LSA_MAX_GROUPS]; + free(info->dom.sam); + } - /* send user aliase query */ - if (get_samr_query_useraliases(smb_cli, - &info->dom.samr_pol_open_domain, - user_rid, &num_aliases, gid)) + if (res) + { + DEBUG(5,("cmd_sam_enum_aliases: succeeded\n")); + } + else { - 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); + DEBUG(5,("cmd_sam_enum_aliases: failed\n")); } } - user_idx++; + +/**************************************************************************** +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; } + + 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 - res = res ? samr_close(smb_cli, + 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, &info->dom.samr_pol_connect) : False; - res = res ? samr_close(smb_cli, + /* 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; + 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_users: succeeded\n")); + DEBUG(5,("cmd_sam_enum_groups: succeeded\n")); } else { - DEBUG(5,("cmd_sam_enum_users: failed\n")); + DEBUG(5,("cmd_sam_enum_groups: failed\n")); } } diff --git a/source3/rpcclient/display.c b/source3/rpcclient/display.c index 5f63b02c76..8a5844f943 100644 --- a/source3/rpcclient/display.c +++ b/source3/rpcclient/display.c @@ -23,6 +23,29 @@ #include "includes.h" +/**************************************************************************** +convert a SID_NAME_USE to a string +****************************************************************************/ +char *get_sid_name_use_str(uint8 sid_name_use) +{ + static fstring type; + + switch (sid_name_use) + { + case SID_NAME_USER : fstrcpy(type, "User" ); break; + case SID_NAME_DOM_GRP : fstrcpy(type, "Domain Group" ); break; + case SID_NAME_DOMAIN : fstrcpy(type, "Domain" ); break; + case SID_NAME_ALIAS : fstrcpy(type, "Local Group" ); break; + case SID_NAME_WKN_GRP : fstrcpy(type, "Well-known Group"); break; + case SID_NAME_DELETED : fstrcpy(type, "Deleted" ); break; + case SID_NAME_INVALID : fstrcpy(type, "Invalid" ); break; + case SID_NAME_UNKNOWN : + default : fstrcpy(type, "UNKNOWN" ); break; + } + + return type; +} + /**************************************************************************** convert a share mode to a string ****************************************************************************/ @@ -174,8 +197,8 @@ void display_srv_info_101(FILE *out_hnd, enum action_type action, display_server(out_hnd, action, name, sv101->srv_type, comment); - fprintf(out_hnd, "\tplatform_id : %d\n" , sv101->platform_id); - fprintf(out_hnd, "\tos version : %d.%d\n" , sv101->ver_major, sv101->ver_minor); + fprintf(out_hnd, "\tplatform_id :\t%d\n" , sv101->platform_id); + fprintf(out_hnd, "\tos version :\t%d.%d\n" , sv101->ver_major, sv101->ver_minor); break; } @@ -217,14 +240,14 @@ void display_srv_info_102(FILE *out_hnd, enum action_type action,SRV_INFO_102 *s display_server(out_hnd, action, name, sv102->srv_type, comment); - fprintf(out_hnd, "\tplatform_id : %d\n" , sv102->platform_id); - fprintf(out_hnd, "\tos version : %d.%d\n" , sv102->ver_major, sv102->ver_minor); + fprintf(out_hnd, "\tplatform_id :\t%d\n" , sv102->platform_id); + fprintf(out_hnd, "\tos version :\t%d.%d\n" , sv102->ver_major, sv102->ver_minor); - fprintf(out_hnd, "\tusers : %x\n" , sv102->users ); - fprintf(out_hnd, "\tdisc, hidden : %x,%x\n" , sv102->disc , sv102->hidden ); - fprintf(out_hnd, "\tannounce, delta : %d, %d\n", sv102->announce , sv102->ann_delta); - fprintf(out_hnd, "\tlicenses : %d\n" , sv102->licenses ); - fprintf(out_hnd, "\tuser path : %s\n" , usr_path); + fprintf(out_hnd, "\tusers :\t%x\n" , sv102->users ); + fprintf(out_hnd, "\tdisc, hidden :\t%x,%x\n" , sv102->disc , sv102->hidden ); + fprintf(out_hnd, "\tannounce, delta :\t%d, %d\n", sv102->announce , sv102->ann_delta); + fprintf(out_hnd, "\tlicenses :\t%d\n" , sv102->licenses ); + fprintf(out_hnd, "\tuser path :\t%s\n" , usr_path); break; } @@ -287,7 +310,7 @@ void display_conn_info_0(FILE *out_hnd, enum action_type action, } case ACTION_ENUMERATE: { - fprintf(out_hnd, "\tid: %d\n", info0->id); + fprintf(out_hnd, "\tid:\t%d\n", info0->id); break; } @@ -327,14 +350,14 @@ void display_conn_info_1(FILE *out_hnd, enum action_type action, fstrcpy(usr_name, unistrn2(str1->uni_usr_name.buffer, str1->uni_usr_name.uni_str_len)); fstrcpy(net_name, unistrn2(str1->uni_net_name.buffer, str1->uni_net_name.uni_str_len)); - fprintf(out_hnd, "\tid : %d\n", info1->id); - fprintf(out_hnd, "\ttype : %s\n", get_share_type_str(info1->type)); - fprintf(out_hnd, "\tnum_opens: %d\n", info1->num_opens); - fprintf(out_hnd, "\tnum_users: %d\n", info1->num_users); - fprintf(out_hnd, "\topen_time: %d\n", info1->open_time); + fprintf(out_hnd, "\tid :\t%d\n", info1->id); + fprintf(out_hnd, "\ttype :\t%s\n", get_share_type_str(info1->type)); + fprintf(out_hnd, "\tnum_opens:\t%d\n", info1->num_opens); + fprintf(out_hnd, "\tnum_users:\t%d\n", info1->num_users); + fprintf(out_hnd, "\topen_time:\t%d\n", info1->open_time); - fprintf(out_hnd, "\tuser name: %s\n", usr_name); - fprintf(out_hnd, "\tnet name: %s\n", net_name); + fprintf(out_hnd, "\tuser name:\t%s\n", usr_name); + fprintf(out_hnd, "\tnet name:\t%s\n", net_name); break; } @@ -678,12 +701,12 @@ void display_file_info_3(FILE *out_hnd, enum action_type action, fstrcpy(path_name, unistrn2(str3->uni_path_name.buffer, str3->uni_path_name.uni_str_len)); fstrcpy(user_name, unistrn2(str3->uni_user_name.buffer, str3->uni_user_name.uni_str_len)); - fprintf(out_hnd, "\tid : %d\n", info3->id); - fprintf(out_hnd, "\tperms : %s\n", get_file_mode_str(info3->perms)); - fprintf(out_hnd, "\tnum_locks: %d\n", info3->num_locks); + fprintf(out_hnd, "\tid :\t%d\n", info3->id); + fprintf(out_hnd, "\tperms :\t%s\n", get_file_mode_str(info3->perms)); + fprintf(out_hnd, "\tnum_locks:\t%d\n", info3->num_locks); - fprintf(out_hnd, "\tpath name: %s\n", path_name); - fprintf(out_hnd, "\tuser name: %s\n", user_name); + fprintf(out_hnd, "\tpath name:\t%s\n", path_name); + fprintf(out_hnd, "\tuser name:\t%s\n", user_name); break; } @@ -866,6 +889,50 @@ void display_name(FILE *out_hnd, enum action_type action, } +/**************************************************************************** + display alias members + ****************************************************************************/ +void display_alias_members(FILE *out_hnd, enum action_type action, + uint32 num_mem, char **sid_mem) +{ + switch (action) + { + case ACTION_HEADER: + { + if (num_mem == 0) + { + fprintf(out_hnd, "\tNo Alias Members\n"); + } + else + { + fprintf(out_hnd, "\tAlias Members:\n"); + fprintf(out_hnd, "\t-------------\n"); + } + break; + } + case ACTION_ENUMERATE: + { + int i; + + for (i = 0; i < num_mem; i++) + { + if (sid_mem[i] != NULL) + { + fprintf(out_hnd, "\tMember Name:\t%s\n", sid_mem[i]); + } + } + + break; + } + case ACTION_FOOTER: + { + fprintf(out_hnd, "\n"); + break; + } + } +} + + /**************************************************************************** display alias rid info ****************************************************************************/ @@ -881,11 +948,11 @@ void display_alias_rid_info(FILE *out_hnd, enum action_type action, sid_to_string(sid_str, sid); if (num_rids == 0) { - fprintf(out_hnd, "\tNo Aliases: Sid %s\n", sid_str); + fprintf(out_hnd, "\tNo Aliases:\tSid %s\n", sid_str); } else { - fprintf(out_hnd, "\tAlias Info: Sid %s\n", sid_str); + fprintf(out_hnd, "\tAlias Info:\tSid %s\n", sid_str); fprintf(out_hnd, "\t----------\n"); } break; @@ -896,7 +963,48 @@ void display_alias_rid_info(FILE *out_hnd, enum action_type action, for (i = 0; i < num_rids; i++) { - fprintf(out_hnd, "\tAlias RID: %8x\n", rid[i]); + fprintf(out_hnd, "\tAlias RID:\t%8x\n", rid[i]); + } + + break; + } + case ACTION_FOOTER: + { + fprintf(out_hnd, "\n"); + break; + } + } +} + +/**************************************************************************** + display group members + ****************************************************************************/ +void display_group_members(FILE *out_hnd, enum action_type action, + uint32 num_mem, fstring *name, uint32 *type) +{ + switch (action) + { + case ACTION_HEADER: + { + if (num_mem == 0) + { + fprintf(out_hnd, "\tNo Members\n"); + } + else + { + fprintf(out_hnd, "\tMembers:\n"); + fprintf(out_hnd, "\t-------\n"); + } + break; + } + case ACTION_ENUMERATE: + { + int i; + + for (i = 0; i < num_mem; i++) + { + fprintf(out_hnd, "\tMember Name:\t%s\tType:\t%s\n", + name[i], get_sid_name_use_str(type[i])); } break; @@ -910,6 +1018,36 @@ void display_alias_rid_info(FILE *out_hnd, enum action_type action, } +#if 0 + +/**************************************************************************** + display group info + ****************************************************************************/ +void display_group_info1(FILE *out_hnd, enum action_type action, GROUP_INFO1 *info1) + +{ + switch (action) + { + case ACTION_HEADER: + { + break; + } + case ACTION_ENUMERATE: + { + int i; + + fprintf(out_hnd, "\tGroup Name:\t%s\tDescription:\t%s\tunk1:\t%sunk2:%s\n", + break; + } + case ACTION_FOOTER: + { + fprintf(out_hnd, "\n"); + break; + } + } +} +#endif + /**************************************************************************** display group rid info ****************************************************************************/ @@ -937,7 +1075,7 @@ void display_group_rid_info(FILE *out_hnd, enum action_type action, for (i = 0; i < num_gids; i++) { - fprintf(out_hnd, "\tGroup RID: %8x attr: %x\n", + fprintf(out_hnd, "\tGroup RID:\t%8x attr:\t%x\n", gid[i].g_rid, gid[i].attr); } @@ -979,7 +1117,7 @@ void display_alias_name_info(FILE *out_hnd, enum action_type action, for (i = 0; i < num_aliases; i++) { - fprintf(out_hnd, "\tAlias Name: %s Attributes: %3d\n", + fprintf(out_hnd, "\tAlias Name:\t%s Attributes:\t%3d\n", alias_name[i], num_als_usrs[i]); } @@ -1010,33 +1148,33 @@ void display_sam_user_info_21(FILE *out_hnd, enum action_type action, SAM_USER_I } case ACTION_ENUMERATE: { - fprintf(out_hnd, "\t\tUser Name : %s\n", unistrn2(usr->uni_user_name .buffer, usr->uni_user_name .uni_str_len)); /* username unicode string */ - fprintf(out_hnd, "\t\tFull Name : %s\n", unistrn2(usr->uni_full_name .buffer, usr->uni_full_name .uni_str_len)); /* user's full name unicode string */ - fprintf(out_hnd, "\t\tHome Drive : %s\n", unistrn2(usr->uni_home_dir .buffer, usr->uni_home_dir .uni_str_len)); /* home directory unicode string */ - fprintf(out_hnd, "\t\tDir Drive : %s\n", unistrn2(usr->uni_dir_drive .buffer, usr->uni_dir_drive .uni_str_len)); /* home directory drive unicode string */ - fprintf(out_hnd, "\t\tProfile Path: %s\n", unistrn2(usr->uni_profile_path.buffer, usr->uni_profile_path.uni_str_len)); /* profile path unicode string */ - fprintf(out_hnd, "\t\tLogon Script: %s\n", unistrn2(usr->uni_logon_script.buffer, usr->uni_logon_script.uni_str_len)); /* logon script unicode string */ - fprintf(out_hnd, "\t\tDescription : %s\n", unistrn2(usr->uni_acct_desc .buffer, usr->uni_acct_desc .uni_str_len)); /* user description unicode string */ - fprintf(out_hnd, "\t\tWorkstations: %s\n", unistrn2(usr->uni_workstations.buffer, usr->uni_workstations.uni_str_len)); /* workstaions unicode string */ - fprintf(out_hnd, "\t\tUnknown Str : %s\n", unistrn2(usr->uni_unknown_str .buffer, usr->uni_unknown_str .uni_str_len)); /* unknown string unicode string */ - fprintf(out_hnd, "\t\tRemote Dial : %s\n", unistrn2(usr->uni_munged_dial .buffer, usr->uni_munged_dial .uni_str_len)); /* munged remote access unicode string */ - - fprintf(out_hnd, "\t\tLogon Time : %s\n", http_timestring(nt_time_to_unix(&(usr->logon_time )))); - fprintf(out_hnd, "\t\tLogoff Time : %s\n", http_timestring(nt_time_to_unix(&(usr->logoff_time )))); - fprintf(out_hnd, "\t\tKickoff Time : %s\n", http_timestring(nt_time_to_unix(&(usr->kickoff_time )))); - fprintf(out_hnd, "\t\tPassword last set Time : %s\n", http_timestring(nt_time_to_unix(&(usr->pass_last_set_time )))); - fprintf(out_hnd, "\t\tPassword can change Time : %s\n", http_timestring(nt_time_to_unix(&(usr->pass_can_change_time )))); - fprintf(out_hnd, "\t\tPassword must change Time: %s\n", http_timestring(nt_time_to_unix(&(usr->pass_must_change_time)))); + fprintf(out_hnd, "\t\tUser Name :\t%s\n", unistrn2(usr->uni_user_name .buffer, usr->uni_user_name .uni_str_len)); /* username unicode string */ + fprintf(out_hnd, "\t\tFull Name :\t%s\n", unistrn2(usr->uni_full_name .buffer, usr->uni_full_name .uni_str_len)); /* user's full name unicode string */ + fprintf(out_hnd, "\t\tHome Drive :\t%s\n", unistrn2(usr->uni_home_dir .buffer, usr->uni_home_dir .uni_str_len)); /* home directory unicode string */ + fprintf(out_hnd, "\t\tDir Drive :\t%s\n", unistrn2(usr->uni_dir_drive .buffer, usr->uni_dir_drive .uni_str_len)); /* home directory drive unicode string */ + fprintf(out_hnd, "\t\tProfile Path:\t%s\n", unistrn2(usr->uni_profile_path.buffer, usr->uni_profile_path.uni_str_len)); /* profile path unicode string */ + fprintf(out_hnd, "\t\tLogon Script:\t%s\n", unistrn2(usr->uni_logon_script.buffer, usr->uni_logon_script.uni_str_len)); /* logon script unicode string */ + fprintf(out_hnd, "\t\tDescription :\t%s\n", unistrn2(usr->uni_acct_desc .buffer, usr->uni_acct_desc .uni_str_len)); /* user description unicode string */ + fprintf(out_hnd, "\t\tWorkstations:\t%s\n", unistrn2(usr->uni_workstations.buffer, usr->uni_workstations.uni_str_len)); /* workstaions unicode string */ + fprintf(out_hnd, "\t\tUnknown Str :\t%s\n", unistrn2(usr->uni_unknown_str .buffer, usr->uni_unknown_str .uni_str_len)); /* unknown string unicode string */ + fprintf(out_hnd, "\t\tRemote Dial :\t%s\n", unistrn2(usr->uni_munged_dial .buffer, usr->uni_munged_dial .uni_str_len)); /* munged remote access unicode string */ + + fprintf(out_hnd, "\t\tLogon Time :\t%s\n", http_timestring(nt_time_to_unix(&(usr->logon_time )))); + fprintf(out_hnd, "\t\tLogoff Time :\t%s\n", http_timestring(nt_time_to_unix(&(usr->logoff_time )))); + fprintf(out_hnd, "\t\tKickoff Time :\t%s\n", http_timestring(nt_time_to_unix(&(usr->kickoff_time )))); + fprintf(out_hnd, "\t\tPassword last set Time :\t%s\n", http_timestring(nt_time_to_unix(&(usr->pass_last_set_time )))); + fprintf(out_hnd, "\t\tPassword can change Time :\t%s\n", http_timestring(nt_time_to_unix(&(usr->pass_can_change_time )))); + fprintf(out_hnd, "\t\tPassword must change Time:\t%s\n", http_timestring(nt_time_to_unix(&(usr->pass_must_change_time)))); fprintf(out_hnd, "\t\tunknown_2[0..31]...\n"); /* user passwords? */ - fprintf(out_hnd, "\t\tuser_rid : %x\n" , usr->user_rid ); /* User ID */ - fprintf(out_hnd, "\t\tgroup_rid: %x\n" , usr->group_rid); /* Group ID */ - fprintf(out_hnd, "\t\tacb_info : %04x\n", usr->acb_info ); /* Account Control Info */ + fprintf(out_hnd, "\t\tuser_rid :\t%x\n" , usr->user_rid ); /* User ID */ + fprintf(out_hnd, "\t\tgroup_rid:\t%x\n" , usr->group_rid); /* Group ID */ + fprintf(out_hnd, "\t\tacb_info :\t%04x\n", usr->acb_info ); /* Account Control Info */ - fprintf(out_hnd, "\t\tunknown_3: %08x\n", usr->unknown_3); /* 0x00ff ffff */ - fprintf(out_hnd, "\t\tlogon_divs: %d\n", usr->logon_divs); /* 0x0000 00a8 which is 168 which is num hrs in a week */ - fprintf(out_hnd, "\t\tunknown_5: %08x\n", usr->unknown_5); /* 0x0002 0000 */ + fprintf(out_hnd, "\t\tunknown_3:\t%08x\n", usr->unknown_3); /* 0x00ff ffff */ + fprintf(out_hnd, "\t\tlogon_divs:\t%d\n", usr->logon_divs); /* 0x0000 00a8 which is 168 which is num hrs in a week */ + fprintf(out_hnd, "\t\tunknown_5:\t%08x\n", usr->unknown_5); /* 0x0002 0000 */ fprintf(out_hnd, "\t\tpadding1[0..7]...\n"); @@ -1133,7 +1271,7 @@ void display_sec_access(FILE *out_hnd, enum action_type action, SEC_ACCESS *info } case ACTION_ENUMERATE: { - fprintf(out_hnd, "\t\tPermissions: %s\n", + fprintf(out_hnd, "\t\tPermissions:\t%s\n", get_sec_mask_str(info->mask)); } case ACTION_FOOTER: @@ -1164,7 +1302,7 @@ void display_sec_ace(FILE *out_hnd, enum action_type action, SEC_ACE *ace) display_sec_access(out_hnd, ACTION_FOOTER , &ace->info); sid_to_string(sid_str, &ace->sid); - fprintf(out_hnd, "\t\tSID: %s\n", sid_str); + fprintf(out_hnd, "\t\tSID:\t%s\n", sid_str); } case ACTION_FOOTER: { @@ -1336,7 +1474,7 @@ static void print_reg_value(FILE *out_hnd, char *val_name, uint32 val_type, BUFF case 0x04: /* uint32 */ { - fprintf(out_hnd,"\t%s:\t%s: 0x%08x\n", val_name, type, buffer2_to_uint32(value)); + fprintf(out_hnd,"\t%s:\t%s:\t0x%08x\n", val_name, type, buffer2_to_uint32(value)); break; } diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index ea5abb23bf..68b7356e53 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -130,10 +130,8 @@ struct {"samuser", cmd_sam_query_user, " SAM User Query (experimental!)"}, {"samtest", cmd_sam_test , "SAM User Encrypted RPC test (experimental!)"}, {"enumaliases",cmd_sam_enum_aliases, "SAM Aliases Database Query (experimental!)"}, -#if 0 {"enumgroups", cmd_sam_enum_groups, "SAM Group Database Query (experimental!)"}, -#endif - {"samgroups", cmd_sam_query_groups, "SAM Group Database Query (experimental!)"}, + {"samgroups", cmd_sam_query_dominfo, "SAM Query Domain Info(experimental!)"}, {"quit", cmd_quit, "logoff the server"}, {"q", cmd_quit, "logoff the server"}, {"exit", cmd_quit, "logoff the server"}, -- cgit