diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-02-08 23:40:49 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-02-08 23:40:49 +0000 |
| commit | 99a9b0f7c4f85f46102457cf4707e8948b77fb3f (patch) | |
| tree | 3bb95603cd8656e486e62ce557d368e0766b1ace /source3/rpc_parse | |
| parent | 37c9693fc8055773812ed86d91f9dfcc554eea30 (diff) | |
| download | samba-99a9b0f7c4f85f46102457cf4707e8948b77fb3f.tar.gz samba-99a9b0f7c4f85f46102457cf4707e8948b77fb3f.tar.bz2 samba-99a9b0f7c4f85f46102457cf4707e8948b77fb3f.zip | |
UNICODE byte ordering issue: typecast to uint16* replaced with SSVAL()
(This used to be commit 9084b7e33dfe717bd8d5604ee71d137e3baef0f5)
Diffstat (limited to 'source3/rpc_parse')
| -rw-r--r-- | source3/rpc_parse/parse_misc.c | 6 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_reg.c | 4 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_rpc.c | 6 |
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 { |