sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r4704: Fix encoding while receiving of a message which was actually sent using STR_ASCII. Patch from Grigory Batalov <bga@altlinux.org>

Browse Source 
(This used to be commit dddd572646)
This commit is contained in:
Alexander Bokovoy 2005-01-12 09:54:50 +00:00 committed by Gerald (Jerry) Carter
parent d81fba2c2a
commit 94b88f8f26
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/smbd/message.c
View File

@ -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 ) );