diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-02-09 19:51:44 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-02-09 19:51:44 +0000 |
| commit | 748f296a76a76d38525ad35df6658811cae60222 (patch) | |
| tree | 977f07b580b89f7f8494847e2fad36946679d51e /source3/rpc_server | |
| parent | 3b12477f34a4311235c7c0b2e9a9cdc9f5a4f0e9 (diff) | |
| download | samba-748f296a76a76d38525ad35df6658811cae60222.tar.gz samba-748f296a76a76d38525ad35df6658811cae60222.tar.bz2 samba-748f296a76a76d38525ad35df6658811cae60222.zip | |
removal of the use of unistrn2 function: replace it with unistr2_to_str
which is more appropriate.
(This used to be commit ac72fe1ab3d10f64a5945ccbd4ed3817e30f9f7b)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_reg.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_reg.c b/source3/rpc_server/srv_reg.c index b90912488f..f98133626d 100644 --- a/source3/rpc_server/srv_reg.c +++ b/source3/rpc_server/srv_reg.c @@ -136,7 +136,7 @@ static void reg_reply_open_entry(REG_Q_OPEN_ENTRY *q_u, status = 0xC000000 | NT_STATUS_TOO_MANY_SECRETS; /* ha ha very droll */ } - fstrcpy(name, unistrn2(q_u->uni_name.buffer, q_u->uni_name.uni_str_len)); + fstrcpy(name, unistr2_to_str(&q_u->uni_name)); if (status == 0x0) { diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index 1fb64c10ef..8961660071 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/rpc_server/srv_samr.c @@ -1527,8 +1527,8 @@ static void samr_reply_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u, fstring user_name; fstring wks; - fstrcpy(user_name, unistrn2(q_u->uni_user_name.buffer, q_u->uni_user_name.uni_str_len)); - fstrcpy(wks , unistrn2(q_u->uni_dest_host.buffer, q_u->uni_dest_host.uni_str_len)); + fstrcpy(user_name, unistr2_to_str(&q_u->uni_user_name)); + fstrcpy(wks , unistr2_to_str(&q_u->uni_dest_host)); DEBUG(5,("samr_chgpasswd_user: user: %s wks: %s\n", user_name, wks)); @@ -2340,8 +2340,7 @@ static void api_samr_unknown_32( uint16 vuid, prs_struct *data, prs_struct *rdat reply if the account already exists... */ - fstrcpy(mach_acct, unistrn2(q_u.uni_mach_acct.buffer, - q_u.uni_mach_acct.uni_str_len)); + fstrcpy(mach_acct, unistr2_to_str(&q_u.uni_mach_acct)); become_root(True); sam_pass = getsam21pwntnam(mach_acct); |