Change uint_t to unsigned int in source4

[samba.git] / source4 / smb_server / smb / reply.c

diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index ec7b6783fd437eb559c26b8598ded370262ad427..ef7cbbf936b8c38b97b2557a1f0418c0559b3bab 100644 (file)
--- a/source4/smb_server/smb/reply.c
+++ b/source4/smb_server/smb/reply.c
@@ -831,7 +831,8 @@ static void reply_read_and_X_send(struct ntvfs_request *ntvfs)
        SMBSRV_VWV_RESERVED(4, 1);
        SSVAL(req->out.vwv, VWV(5), io->readx.out.nread);
        SSVAL(req->out.vwv, VWV(6), PTR_DIFF(io->readx.out.data, req->out.hdr));
-       SMBSRV_VWV_RESERVED(7, 5);
+       SSVAL(req->out.vwv, VWV(7), (io->readx.out.nread>>16));
+       SMBSRV_VWV_RESERVED(8, 4);
 
        smbsrv_chain_reply(req);
 }
@@ -1062,7 +1063,7 @@ void smbsrv_reply_write_and_X(struct smbsrv_request *req)
 
        /* make sure the data is in bounds */
        if (req_data_oob(&req->in.bufinfo, io->writex.in.data, io->writex.in.count)) {
-               smbsrv_send_error(req, NT_STATUS_FOOBAR);
+               smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRerror));
                return;
        }
 
@@ -1379,7 +1380,7 @@ static void reply_printqueue_send(struct ntvfs_request *ntvfs)
        struct smbsrv_request *req;
        union smb_lpq *lpq;
        int i, maxcount;
-       const uint_t el_size = 28;
+       const unsigned int el_size = 28;
 
        SMBSRV_CHECK_ASYNC_STATUS(lpq,union smb_lpq);
 
@@ -1646,8 +1647,8 @@ static void reply_lockingX_send(struct ntvfs_request *ntvfs)
 void smbsrv_reply_lockingX(struct smbsrv_request *req)
 {
        union smb_lock *lck;
-       uint_t total_locks, i;
-       uint_t lck_size;
+       unsigned int total_locks, i;
+       unsigned int lck_size;
        uint8_t *p;
 
        /* parse request */
@@ -2215,7 +2216,7 @@ void smbsrv_reply_ntcreate_and_X(struct smbsrv_request *req)
        /* notice that the word parameters are not word aligned, so we don't use VWV() */
        fname_len =                         SVAL(req->in.vwv, 5);
        io->ntcreatex.in.flags =            IVAL(req->in.vwv, 7);
-       io->ntcreatex.in.root_fid =         IVAL(req->in.vwv, 11);
+       io->ntcreatex.in.root_fid.ntvfs =   smbsrv_pull_fnum(req, req->in.vwv, 11);
        io->ntcreatex.in.access_mask =      IVAL(req->in.vwv, 15);
        io->ntcreatex.in.alloc_size =       BVAL(req->in.vwv, 19);
        io->ntcreatex.in.file_attr =        IVAL(req->in.vwv, 27);