summaryrefslogtreecommitdiff
path: root/source3/rpc_parse
diff options
context:
space:
mode:
Diffstat (limited to 'source3/rpc_parse')
-rw-r--r--source3/rpc_parse/parse_misc.c6
-rw-r--r--source3/rpc_parse/parse_reg.c2
-rw-r--r--source3/rpc_parse/parse_rpc.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index bf3bba1249..7c3f446908 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -329,7 +329,7 @@ creates a UNISTR structure.
void make_unistr(UNISTR *str, char *buf)
{
/* store the string (null-terminated copy) */
- struni2((char *)(str->buffer), buf);
+ str_to_unistr16(str->buffer, buf);
}
/*******************************************************************
@@ -372,7 +372,7 @@ void make_buffer3_str(BUFFER3 *str, char *buf, int len)
str->buf_len = len * 2;
/* store the string (null-terminated 8 bit chars into 16 bit chars) */
- struni2(str->buffer, buf);
+ str_to_unistr8(str->buffer, buf);
}
/*******************************************************************
@@ -573,7 +573,7 @@ void make_unistr2(UNISTR2 *str, const char *buf, int len)
str->uni_str_len = len;
/* store the string (null-terminated 8 bit chars into 16 bit chars) */
- struni2((char*)(str->buffer), buf);
+ str_to_unistr16((str->buffer), buf);
}
/*******************************************************************
diff --git a/source3/rpc_parse/parse_reg.c b/source3/rpc_parse/parse_reg.c
index a3d8ebb64a..84d9650105 100644
--- a/source3/rpc_parse/parse_reg.c
+++ b/source3/rpc_parse/parse_reg.c
@@ -769,7 +769,7 @@ void make_reg_r_info(REG_R_INFO *r_r,
uint32 status)
{
char buf[512];
- int len = struni2(buf, os_type);
+ int len = str_to_unistr8(buf, os_type);
r_r->ptr1 = 1;
r_r->level = level;
diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c
index 12e94ace77..63f738466b 100644
--- a/source3/rpc_parse/parse_rpc.c
+++ b/source3/rpc_parse/parse_rpc.c
@@ -707,9 +707,9 @@ void make_rpc_auth_ntlmssp_resp(RPC_AUTH_NTLMSSP_RESP *rsp,
if (IS_BITS_SET_ALL(neg_flags, NTLMSSP_NEGOTIATE_UNICODE))
{
- struni2(rsp->domain, domain);
- struni2(rsp->user , user );
- struni2(rsp->wks , wks );
+ str_to_unistr8(rsp->domain, domain);
+ str_to_unistr8(rsp->user , user );
+ str_to_unistr8(rsp->wks , wks );
}
else
{