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_server/srv_samr_nt.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/rpc_server/srv_samr_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index e95fd0c7f9..950a186e03 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -4470,7 +4470,7 @@ NTSTATUS _samr_create_dom_alias(pipes_struct *p, SAMR_Q_CREATE_DOM_ALIAS *q_u, S if (!sid_equal(&dom_sid, get_global_sam_sid())) return NT_STATUS_ACCESS_DENIED; - unistr2_to_ascii(name, &q_u->uni_acct_desc, sizeof(name)-1); + unistr2_to_ascii(name, &q_u->uni_acct_desc, sizeof(name)); se_priv_copy( &se_rights, &se_add_users ); can_add_accounts = user_has_privileges( p->pipe_user.nt_user_token, &se_rights ); @@ -4659,10 +4659,10 @@ NTSTATUS _samr_set_groupinfo(pipes_struct *p, SAMR_Q_SET_GROUPINFO *q_u, SAMR_R_ switch (ctr->switch_value1) { case 1: - unistr2_to_ascii(map.comment, &(ctr->group.info1.uni_acct_desc), sizeof(map.comment)-1); + unistr2_to_ascii(map.comment, &(ctr->group.info1.uni_acct_desc), sizeof(map.comment)); break; case 4: - unistr2_to_ascii(map.comment, &(ctr->group.info4.uni_acct_desc), sizeof(map.comment)-1); + unistr2_to_ascii(map.comment, &(ctr->group.info4.uni_acct_desc), sizeof(map.comment)); break; default: return NT_STATUS_INVALID_INFO_CLASS; @@ -4743,7 +4743,7 @@ NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_ return NT_STATUS_INVALID_PARAMETER; unistr2_to_ascii( acct_name, ctr->alias.info2.name.string, - sizeof(acct_name)-1 ); + sizeof(acct_name)); /* If the name is the same just reply "ok". Yes this doesn't allow you to change the case of a group name. */ @@ -4766,7 +4766,7 @@ NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_ if ( ctr->alias.info3.description.string ) { unistr2_to_ascii( info.acct_desc, ctr->alias.info3.description.string, - sizeof(info.acct_desc)-1 ); + sizeof(info.acct_desc)); } else fstrcpy( info.acct_desc, "" ); |