diff options
| author | Günther Deschner <gd@samba.org> | 2006-02-27 10:32:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:25 -0500 |
| commit | e54786b53543b4667288c64abb55478fddd95061 (patch) | |
| tree | c9641bd414989a72be6c425f9857f5731da74188 /source3/rpcclient | |
| parent | bd97e1a5eae982feda5e5bbd08e7f4e3b6473baf (diff) | |
| download | samba-e54786b53543b4667288c64abb55478fddd95061.tar.gz samba-e54786b53543b4667288c64abb55478fddd95061.tar.bz2 samba-e54786b53543b4667288c64abb55478fddd95061.zip | |
r13711: * Correctly handle acb_info/acct_flags as uint32 not as uint16.
* Fix a couple of related parsing issues.
* in the info3 reply in a samlogon, return the ACB-flags (instead of
returning zero)
Guenther
(This used to be commit 5b89e8bc24f0fdc8b52d5c9e849aba723df34ea7)
Diffstat (limited to 'source3/rpcclient')
| -rw-r--r-- | source3/rpcclient/cmd_samr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index 13da71a7fd..82194c84c7 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -100,7 +100,7 @@ static void display_sam_user_info_21(SAM_USER_INFO_21 *usr) printf("\tuser_rid :\t0x%x\n" , usr->user_rid ); /* User ID */ printf("\tgroup_rid:\t0x%x\n" , usr->group_rid); /* Group ID */ - printf("\tacb_info :\t0x%04x\n", usr->acb_info ); /* Account Control Info */ + printf("\tacb_info :\t0x%08x\n", usr->acb_info ); /* Account Control Info */ printf("\tfields_present:\t0x%08x\n", usr->fields_present); /* 0x00ff ffff */ printf("\tlogon_divs:\t%d\n", usr->logon_divs); /* 0x0000 00a8 which is 168 which is num hrs in a week */ @@ -776,7 +776,7 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli, char **dom_users; uint32 *dom_rids; uint32 access_mask = MAXIMUM_ALLOWED_ACCESS; - uint16 acb_mask = ACB_NORMAL; + uint32 acb_mask = ACB_NORMAL; BOOL got_connect_pol = False, got_domain_pol = False; if ((argc < 1) || (argc > 3)) { @@ -788,7 +788,7 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli, sscanf(argv[1], "%x", &access_mask); if (argc > 2) - sscanf(argv[2], "%hx", &acb_mask); + sscanf(argv[2], "%x", &acb_mask); /* Get sam policy handle */ @@ -1367,7 +1367,7 @@ static NTSTATUS cmd_samr_create_dom_user(struct rpc_pipe_client *cli, POLICY_HND connect_pol, domain_pol, user_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; const char *acct_name; - uint16 acb_info; + uint32 acb_info; uint32 unknown, user_rid; uint32 access_mask = MAXIMUM_ALLOWED_ACCESS; |