diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-28 10:21:22 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 02:39:08 +0200 |
| commit | 96108eed100e1962c4abd75a021d84467ae4d690 (patch) | |
| tree | b82b08ace61748a4886abaef6f1afb4936d3669e /source3/smbd/reply.c | |
| parent | 214a668ff3b189f6b55bd97a12177baf46bd1585 (diff) | |
| download | samba-96108eed100e1962c4abd75a021d84467ae4d690.tar.gz samba-96108eed100e1962c4abd75a021d84467ae4d690.tar.bz2 samba-96108eed100e1962c4abd75a021d84467ae4d690.zip | |
build: #ifdef LARGE_SMB_OFF_T as off_t is now always 64 bits
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 884731088a..8cefba0dfc 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3207,28 +3207,9 @@ void reply_readbraw(struct smb_request *req) /* * This is a large offset (64 bit) read. */ -#ifdef LARGE_SMB_OFF_T startpos |= (((SMB_OFF_T)IVAL(req->vwv+8, 0)) << 32); -#else /* !LARGE_SMB_OFF_T */ - - /* - * Ensure we haven't been sent a >32 bit offset. - */ - - if(IVAL(req->vwv+8, 0) != 0) { - DEBUG(0,("reply_readbraw: large offset " - "(%x << 32) used and we don't support " - "64 bit offsets.\n", - (unsigned int)IVAL(req->vwv+8, 0) )); - reply_readbraw_error(sconn); - END_PROFILE(SMBreadbraw); - return; - } - -#endif /* LARGE_SMB_OFF_T */ - if(startpos < 0) { DEBUG(0,("reply_readbraw: negative 64 bit " "readraw offset (%.0f) !\n", @@ -3796,29 +3777,11 @@ void reply_read_and_X(struct smb_request *req) } if (req->wct == 12) { -#ifdef LARGE_SMB_OFF_T /* * This is a large offset (64 bit) read. */ startpos |= (((SMB_OFF_T)IVAL(req->vwv+10, 0)) << 32); -#else /* !LARGE_SMB_OFF_T */ - - /* - * Ensure we haven't been sent a >32 bit offset. - */ - - if(IVAL(req->vwv+10, 0) != 0) { - DEBUG(0,("reply_read_and_X - large offset (%x << 32) " - "used and we don't support 64 bit offsets.\n", - (unsigned int)IVAL(req->vwv+10, 0) )); - END_PROFILE(SMBreadX); - reply_nterror(req, NT_STATUS_ACCESS_DENIED); - return; - } - -#endif /* LARGE_SMB_OFF_T */ - } if (!big_readX) { @@ -4556,27 +4519,11 @@ void reply_write_and_X(struct smb_request *req) data = smb_base(req->inbuf) + smb_doff; if(req->wct == 14) { -#ifdef LARGE_SMB_OFF_T /* * This is a large offset (64 bit) write. */ startpos |= (((SMB_OFF_T)IVAL(req->vwv+12, 0)) << 32); -#else /* !LARGE_SMB_OFF_T */ - - /* - * Ensure we haven't been sent a >32 bit offset. - */ - - if(IVAL(req->vwv+12, 0) != 0) { - DEBUG(0,("reply_write_and_X - large offset (%x << 32) " - "used and we don't support 64 bit offsets.\n", - (unsigned int)IVAL(req->vwv+12, 0) )); - reply_nterror(req, NT_STATUS_ACCESS_DENIED); - goto out; - } - -#endif /* LARGE_SMB_OFF_T */ } /* X/Open SMB protocol says that, unlike SMBwrite |