3 files changed, 8 insertions, 8 deletions
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 6b3fc9415e..e1a7d3c6a5 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(str->buffer, buf);
+	struni2((char *)(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((uint16*)str->buffer, buf);
+	struni2(str->buffer, buf);
 }
 
 /*******************************************************************
@@ -573,7 +573,7 @@ void make_unistr2(UNISTR2 *str, char *buf, int len)
 	str->uni_str_len = len;
 
 	/* store the string (null-terminated 8 bit chars into 16 bit chars) */
-	struni2(str->buffer, buf);
+	struni2((char *)(str->buffer), buf);
 }
 
 /*******************************************************************
diff --git a/source3/rpc_parse/parse_reg.c b/source3/rpc_parse/parse_reg.c
index b0086f402a..a3d8ebb64a 100644
--- a/source3/rpc_parse/parse_reg.c
+++ b/source3/rpc_parse/parse_reg.c
@@ -768,8 +768,8 @@ void make_reg_r_info(REG_R_INFO *r_r,
 				uint32 level, char *os_type,
 				uint32 status)
 {
-	uint8 buf[512];
-	int len = struni2((uint16*)buf, os_type);
+	char buf[512];
+	int len = struni2(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 9ce83bea83..12e94ace77 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((uint16*)rsp->domain, domain);
-		struni2((uint16*)rsp->user  , user  );
-		struni2((uint16*)rsp->wks   , wks   );
+		struni2(rsp->domain, domain);
+		struni2(rsp->user  , user  );
+		struni2(rsp->wks   , wks   );
 	}
 	else
 	{