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/rpc_client | |
| 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/rpc_client')
| -rw-r--r-- | source3/rpc_client/cli_samr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index 7a210f0d3a..b1b6623bcd 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -683,7 +683,7 @@ NTSTATUS rpccli_samr_enum_dom_users(struct rpc_pipe_client *cli, TALLOC_CTX *mem fstring conv_buf; (*rids)[i] = r.sam[i].rid; - unistr2_to_ascii(conv_buf, &(r.uni_acct_name[i]), sizeof(conv_buf) - 1); + unistr2_to_ascii(conv_buf, &(r.uni_acct_name[i]), sizeof(conv_buf)); (*dom_users)[i] = talloc_strdup(mem_ctx, conv_buf); } } @@ -751,7 +751,7 @@ NTSTATUS rpccli_samr_enum_dom_groups(struct rpc_pipe_client *cli, if (r.sam[i].hdr_name.buffer) { unistr2_to_ascii((*dom_groups)[i].acct_name, &r.uni_grp_name[name_idx], - sizeof(fstring) - 1); + sizeof((*dom_groups)[i].acct_name)); name_idx++; } @@ -822,7 +822,7 @@ NTSTATUS rpccli_samr_enum_als_groups(struct rpc_pipe_client *cli, if (r.sam[i].hdr_name.buffer) { unistr2_to_ascii((*dom_aliases)[i].acct_name, &r.uni_grp_name[name_idx], - sizeof(fstring) - 1); + sizeof((*dom_aliases)[i].acct_name)); name_idx++; } @@ -1699,7 +1699,7 @@ NTSTATUS rpccli_samr_lookup_rids(struct rpc_pipe_client *cli, for (i = 0; i < r.num_names1; i++) { fstring tmp; - unistr2_to_ascii(tmp, &r.uni_name[i], sizeof(tmp) - 1); + unistr2_to_ascii(tmp, &r.uni_name[i], sizeof(tmp)); (*names)[i] = talloc_strdup(mem_ctx, tmp); (*name_types)[i] = r.type[i]; } |