svn commit: samba r4704 - in branches/SAMBA_3_0/source/smbd: .

[ab at samba.org]

Author: ab
Date: 2005-01-12 09:54:50 +0000 (Wed, 12 Jan 2005)
New Revision: 4704

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4704

Log:
Fix encoding while receiving of a message which was actually sent using STR_ASCII. Patch from Grigory Batalov <bga at altlinux.org>
Modified:
   branches/SAMBA_3_0/source/smbd/message.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/message.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/message.c	2005-01-12 07:57:33 UTC (rev 4703)
+++ branches/SAMBA_3_0/source/smbd/message.c	2005-01-12 09:54:50 UTC (rev 4704)
@@ -127,8 +127,8 @@
   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 @@
   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 ) );