mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
r4704: Fix encoding while receiving of a message which was actually sent using STR_ASCII. Patch from Grigory Batalov <bga@altlinux.org>
(This used to be commit dddd572646
)
This commit is contained in:
parent
d81fba2c2a
commit
94b88f8f26
@ -127,8 +127,8 @@ int reply_sends(connection_struct *conn,
|
|||||||
outsize = set_message(outbuf,0,0,True);
|
outsize = set_message(outbuf,0,0,True);
|
||||||
|
|
||||||
p = smb_buf(inbuf)+1;
|
p = smb_buf(inbuf)+1;
|
||||||
p += srvstr_pull_buf(inbuf, msgfrom, p, sizeof(msgfrom), STR_TERMINATE) + 1;
|
p += srvstr_pull_buf(inbuf, msgfrom, p, sizeof(msgfrom), STR_ASCII|STR_TERMINATE) + 1;
|
||||||
p += srvstr_pull_buf(inbuf, msgto, p, sizeof(msgto), STR_TERMINATE) + 1;
|
p += srvstr_pull_buf(inbuf, msgto, p, sizeof(msgto), STR_ASCII|STR_TERMINATE) + 1;
|
||||||
|
|
||||||
msg = p;
|
msg = p;
|
||||||
|
|
||||||
@ -169,8 +169,8 @@ int reply_sendstrt(connection_struct *conn,
|
|||||||
msgpos = 0;
|
msgpos = 0;
|
||||||
|
|
||||||
p = smb_buf(inbuf)+1;
|
p = smb_buf(inbuf)+1;
|
||||||
p += srvstr_pull_buf(inbuf, msgfrom, p, sizeof(msgfrom), STR_TERMINATE) + 1;
|
p += srvstr_pull_buf(inbuf, msgfrom, p, sizeof(msgfrom), STR_ASCII|STR_TERMINATE) + 1;
|
||||||
p += srvstr_pull_buf(inbuf, msgto, p, sizeof(msgto), STR_TERMINATE) + 1;
|
p += srvstr_pull_buf(inbuf, msgto, p, sizeof(msgto), STR_ASCII|STR_TERMINATE) + 1;
|
||||||
|
|
||||||
DEBUG( 3, ( "SMBsendstrt (from %s to %s)\n", msgfrom, msgto ) );
|
DEBUG( 3, ( "SMBsendstrt (from %s to %s)\n", msgfrom, msgto ) );
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user