diff options
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/reply.c | 53 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 29 |
2 files changed, 0 insertions, 82 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 diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index da552f5a51..40a1a5dc80 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -5913,14 +5913,7 @@ static NTSTATUS smb_file_position_information(connection_struct *conn, } position_information = (uint64_t)IVAL(pdata,0); -#ifdef LARGE_SMB_OFF_T position_information |= (((uint64_t)IVAL(pdata,4)) << 32); -#else /* LARGE_SMB_OFF_T */ - if (IVAL(pdata,4) != 0) { - /* more than 32 bits? */ - return NT_STATUS_INVALID_PARAMETER; - } -#endif /* LARGE_SMB_OFF_T */ DEBUG(10,("smb_file_position_information: Set file position " "information for file %s to %.0f\n", fsp_str_dbg(fsp), @@ -6671,15 +6664,7 @@ static NTSTATUS smb_set_file_allocation_info(connection_struct *conn, } allocation_size = (uint64_t)IVAL(pdata,0); -#ifdef LARGE_SMB_OFF_T allocation_size |= (((uint64_t)IVAL(pdata,4)) << 32); -#else /* LARGE_SMB_OFF_T */ - if (IVAL(pdata,4) != 0) { - /* more than 32 bits? */ - return NT_STATUS_INVALID_PARAMETER; - } -#endif /* LARGE_SMB_OFF_T */ - DEBUG(10,("smb_set_file_allocation_info: Set file allocation info for " "file %s to %.0f\n", smb_fname_str_dbg(smb_fname), (double)allocation_size)); @@ -6777,14 +6762,7 @@ static NTSTATUS smb_set_file_end_of_file_info(connection_struct *conn, } size = IVAL(pdata,0); -#ifdef LARGE_SMB_OFF_T size |= (((SMB_OFF_T)IVAL(pdata,4)) << 32); -#else /* LARGE_SMB_OFF_T */ - if (IVAL(pdata,4) != 0) { - /* more than 32 bits? */ - return NT_STATUS_INVALID_PARAMETER; - } -#endif /* LARGE_SMB_OFF_T */ DEBUG(10,("smb_set_file_end_of_file_info: Set end of file info for " "file %s to %.0f\n", smb_fname_str_dbg(smb_fname), (double)size)); @@ -6917,14 +6895,7 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn, if(IVAL(pdata, 0) != SMB_SIZE_NO_CHANGE_LO && IVAL(pdata, 4) != SMB_SIZE_NO_CHANGE_HI) { size=IVAL(pdata,0); /* first 8 Bytes are size */ -#ifdef LARGE_SMB_OFF_T size |= (((SMB_OFF_T)IVAL(pdata,4)) << 32); -#else /* LARGE_SMB_OFF_T */ - if (IVAL(pdata,4) != 0) { - /* more than 32 bits? */ - return NT_STATUS_INVALID_PARAMETER; - } -#endif /* LARGE_SMB_OFF_T */ } ft.atime = interpret_long_date(pdata+24); /* access_time */ |