r23726: Explicitly pass down the FLAGS2 field to srvstr_pull_buf. The next

[ira/wip.git] / source3 / smbd / message.c

diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index e6a5015276ccd58f316d7c3174a68406ba7a35d4..f390e539b054b58781fb9158e2379864febb328a 100644 (file)
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -134,8 +134,10 @@ int reply_sends(connection_struct *conn, char *inbuf,char *outbuf, int dum_size,
        outsize = set_message(inbuf,outbuf,0,0,True);
 
        p = smb_buf(inbuf)+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;
+       p += srvstr_pull_buf(inbuf, SVAL(inbuf, smb_flg2), msgfrom, p,
+                            sizeof(msgfrom), STR_ASCII|STR_TERMINATE) + 1;
+       p += srvstr_pull_buf(inbuf, SVAL(inbuf, smb_flg2), msgto, p,
+                            sizeof(msgto), STR_ASCII|STR_TERMINATE) + 1;
 
        msg = p;
 
@@ -176,8 +178,10 @@ int reply_sendstrt(connection_struct *conn, char *inbuf,char *outbuf, int dum_si
        msgpos = 0;
 
        p = smb_buf(inbuf)+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;
+       p += srvstr_pull_buf(inbuf, SVAL(inbuf, smb_flg2), msgfrom, p,
+                            sizeof(msgfrom), STR_ASCII|STR_TERMINATE) + 1;
+       p += srvstr_pull_buf(inbuf, SVAL(inbuf, smb_flg2), msgto, p,
+                            sizeof(msgto), STR_ASCII|STR_TERMINATE) + 1;
 
        DEBUG( 3, ( "SMBsendstrt (from %s to %s)\n", msgfrom, msgto ) );