summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-11-06 18:46:42 +0000
committerLuke Leighton <lkcl@samba.org>1998-11-06 18:46:42 +0000
commit53abed10e7ce1b1af0c7e099a6aa9744277545c5 (patch)
treef6ff073893d3f4db4894dcc005ed4679d4101e97 /source3
parent4bd1feb68c4f5134293d87433da932c20cded915 (diff)
downloadsamba-53abed10e7ce1b1af0c7e099a6aa9744277545c5.tar.gz
samba-53abed10e7ce1b1af0c7e099a6aa9744277545c5.tar.bz2
samba-53abed10e7ce1b1af0c7e099a6aa9744277545c5.zip
grumble, grumble off-by-one unicode string fixes, gonna stuff my other
tree with cvs clashes when i cvs update on the group code grumble grumble (This used to be commit f8b229d187cea2e3820d71697346fc9f0cd8bf88)
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/srv_samr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 034e4dd336..323298ef7a 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -78,9 +78,9 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 *pw_buf,
}
user_name_len = strlen(pwd->smb_name);
- make_unistr2(&(pw_buf[(*num_entries)].uni_user_name), pwd->smb_name, user_name_len-1);
- make_uni_hdr(&(pw_buf[(*num_entries)].hdr_user_name), user_name_len-1,
- user_name_len-1, 1);
+ make_unistr2(&(pw_buf[(*num_entries)].uni_user_name), pwd->smb_name, user_name_len);
+ make_uni_hdr(&(pw_buf[(*num_entries)].hdr_user_name), user_name_len,
+ user_name_len, 1);
pw_buf[(*num_entries)].user_rid = pwd->user_rid;
bzero( pw_buf[(*num_entries)].nt_pwd , 16);
@@ -418,7 +418,7 @@ static void samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
got_grps = True;
num_entries = 1;
- make_unistr2(&(pass[0].uni_user_name), dummy_group, strlen(dummy_group)-1);
+ make_unistr2(&(pass[0].uni_user_name), dummy_group, strlen(dummy_group));
pass[0].user_rid = DOMAIN_GROUP_RID_ADMINS;
if (r_e.status == 0 && got_grps)
@@ -481,7 +481,7 @@ static void samr_reply_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_u,
char *name;
while (num_entries < MAX_SAM_ENTRIES && ((name = builtin_alias_rids[num_entries].name) != NULL))
{
- make_unistr2(&(pass[num_entries].uni_user_name), name, strlen(name)-1);
+ make_unistr2(&(pass[num_entries].uni_user_name), name, strlen(name));
pass[num_entries].user_rid = builtin_alias_rids[num_entries].rid;
num_entries++;
}