diff options
| author | Alexander Bokovoy <ab@samba.org> | 2005-01-12 09:54:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:51 -0500 |
| commit | 94b88f8f26342b6ca4afecec459235c523355f6c (patch) | |
| tree | 9c7fea67d9694987c28e000d4c0bdd1f2a5a3e3c | |
| parent | d81fba2c2a5572dc82b1d89a6d4f1b58a58ef44e (diff) | |
| download | samba-94b88f8f26342b6ca4afecec459235c523355f6c.tar.gz samba-94b88f8f26342b6ca4afecec459235c523355f6c.tar.bz2 samba-94b88f8f26342b6ca4afecec459235c523355f6c.zip | |
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 dddd5726462c13374788713ad5ddcbdf9ee7b439)
| -rw-r--r-- | source3/smbd/message.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/message.c b/source3/smbd/message.c index f853a91475..5af7d3e451 100644 --- a/source3/smbd/message.c +++ b/source3/smbd/message.c @@ -127,8 +127,8 @@ int reply_sends(connection_struct *conn, outsize = set_message(outbuf,0,0,True); p = smb_buf(inbuf)+1; - p += srvstr_pull_buf(inbuf, msgfrom, p, sizeof(msgfrom), STR_TERMINATE) + 1; - p += srvstr_pull_buf(inbuf, msgto, p, sizeof(msgto), 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_ASCII|STR_TERMINATE) + 1; msg = p; @@ -169,8 +169,8 @@ int reply_sendstrt(connection_struct *conn, msgpos = 0; p = smb_buf(inbuf)+1; - p += srvstr_pull_buf(inbuf, msgfrom, p, sizeof(msgfrom), STR_TERMINATE) + 1; - p += srvstr_pull_buf(inbuf, msgto, p, sizeof(msgto), 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_ASCII|STR_TERMINATE) + 1; DEBUG( 3, ( "SMBsendstrt (from %s to %s)\n", msgfrom, msgto ) ); |