diff options
| author | Michael Adam <obnox@samba.org> | 2007-09-21 14:37:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:30:58 -0500 |
| commit | c97fe37ea3d92a631e8da17c21dafae1db15e97b (patch) | |
| tree | 8a198088c25da1fdd720da7e9d056186eb468380 /source3/utils/net_rpc.c | |
| parent | 6873d5446e4cee76b022bfc0d33e9e8380e796c0 (diff) | |
| download | samba-c97fe37ea3d92a631e8da17c21dafae1db15e97b.tar.gz samba-c97fe37ea3d92a631e8da17c21dafae1db15e97b.tar.bz2 samba-c97fe37ea3d92a631e8da17c21dafae1db15e97b.zip | |
r25294: Tidy up callers of unistr2_to_ascii() to pass sizeof(target_area) to
the maxeln parameter instead of sizeof(target_area) - 1 (or even
sizeof(fstring) - 1 in some places.
I hope these were really all there were.
Michael
(This used to be commit 9a28be220df622322857dfe102fa35e108f932dc)
Diffstat (limited to 'source3/utils/net_rpc.c')
| -rw-r--r-- | source3/utils/net_rpc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index e44d33d874..b2e37ac559 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -1257,9 +1257,9 @@ static NTSTATUS rpc_user_list_internals(const DOM_SID *domain_sid, loop_count++; for (i = 0; i < num_entries; i++) { - unistr2_to_ascii(user, &(&ctr.sam.info1->str[i])->uni_acct_name, sizeof(user)-1); + unistr2_to_ascii(user, &(&ctr.sam.info1->str[i])->uni_acct_name, sizeof(user)); if (opt_long_list_entries) - unistr2_to_ascii(desc, &(&ctr.sam.info1->str[i])->uni_acct_desc, sizeof(desc)-1); + unistr2_to_ascii(desc, &(&ctr.sam.info1->str[i])->uni_acct_desc, sizeof(desc)); if (opt_long_list_entries) printf("%-21.21s %s\n", user, desc); @@ -1808,7 +1808,7 @@ static NTSTATUS rpc_group_delete_internals(const DOM_SID *domain_sid, if (user_ctr->info.id21->group_rid == group_rid) { unistr2_to_ascii(temp, &(user_ctr->info.id21)->uni_user_name, - sizeof(temp)-1); + sizeof(temp)); if (opt_verbose) d_printf("Group is primary group of %s\n",temp); group_is_primary = True; @@ -2515,8 +2515,8 @@ static NTSTATUS rpc_group_list_internals(const DOM_SID *domain_sid, fstring group, desc; - unistr2_to_ascii(group, &(&ctr.sam.info3->str[i])->uni_grp_name, sizeof(group)-1); - unistr2_to_ascii(desc, &(&ctr.sam.info3->str[i])->uni_grp_desc, sizeof(desc)-1); + unistr2_to_ascii(group, &(&ctr.sam.info3->str[i])->uni_grp_name, sizeof(group)); + unistr2_to_ascii(desc, &(&ctr.sam.info3->str[i])->uni_grp_desc, sizeof(desc)); if (opt_long_list_entries) printf("%-21.21s %-50.50s\n", |