r4212: Ensure we only look at the bottom bit of large_readx.

Set the 14 word version of write if size > 0xffff as
well as 64-bit offset.
Jeremy.

diff --git a/source/libsmb/clireadwrite.c b/source/libsmb/clireadwrite.c
index 1785905ff2edc863ac87353a676573717c2a0878..9e52ed35949944d9d24a2a6a681cded962c854e9 100644 (file)
--- a/source/libsmb/clireadwrite.c
+++ b/source/libsmb/clireadwrite.c
@@ -259,7 +259,7 @@ static BOOL cli_issue_write(struct cli_state *cli, int fnum, off_t offset,
                            size_t size, int i)
 {
        char *p;
-       BOOL bigoffset = False;
+       BOOL large_writex = False;
 
        if (size > cli->bufsize) {
                cli->outbuf = SMB_REALLOC(cli->outbuf, size + 1024);
@@ -272,10 +272,11 @@ static BOOL cli_issue_write(struct cli_state *cli, int fnum, off_t offset,
        memset(cli->outbuf,'\0',smb_size);
        memset(cli->inbuf,'\0',smb_size);
 
-       if ((SMB_BIG_UINT)offset >> 32) 
-               bigoffset = True;
+       if (((SMB_BIG_UINT)offset >> 32) || (size > 0xFFFF)) {
+               large_writex = True;
+       }
 
-       if (bigoffset)
+       if (large_writex)
                set_message(cli->outbuf,14,0,True);
        else
                set_message(cli->outbuf,12,0,True);
@@ -303,7 +304,7 @@ static BOOL cli_issue_write(struct cli_state *cli, int fnum, off_t offset,
        SSVAL(cli->outbuf,smb_vwv11,
              smb_buf(cli->outbuf) - smb_base(cli->outbuf));
 
-       if (bigoffset)
+       if (large_writex)
                SIVAL(cli->outbuf,smb_vwv12,(offset>>32) & 0xffffffff);
        
        p = smb_base(cli->outbuf) + SVAL(cli->outbuf,smb_vwv11);

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index eead0bc1a1422b83e00dd680f1b38a77b6a30b50..22cbf45e21ca46f31d341d57c512a89118ffad2b 100644 (file)
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -2239,7 +2239,9 @@ int reply_read_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
        set_message(outbuf,12,0,True);
 
        if (global_client_caps & CAP_LARGE_READX) {
-               smb_maxcnt |= ((((size_t)SVAL(inbuf,smb_vwv7)) & 1 )<<16);
+               if (SVAL(inbuf,smb_vwv7) == 1) {
+                       smb_maxcnt |= (1<<16);
+               }
                if (smb_maxcnt > BUFFER_SIZE) {
                        DEBUG(0,("reply_read_and_X - read too large (%u) for reply buffer %u\n",
                                (unsigned int)smb_maxcnt, (unsigned int)BUFFER_SIZE));