diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-15 09:52:07 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-07-22 15:32:39 +0200 |
| commit | 823215bf98754c5438c055475a56afec2bddcf22 (patch) | |
| tree | a7e8defd570736a96244ba8caf0cdc4c770b2370 /source3/smbd/reply.c | |
| parent | bd787beee9666443bf44a6625800534e97ed0bfc (diff) | |
| download | samba-823215bf98754c5438c055475a56afec2bddcf22.tar.gz samba-823215bf98754c5438c055475a56afec2bddcf22.tar.xz samba-823215bf98754c5438c055475a56afec2bddcf22.zip | |
smbd: "err" is no longer set in get_lock_offset
This was only referenced in the !HAVE_LONGLONG section
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 7455da320d..1bb606f52b 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -7595,12 +7595,10 @@ uint64_t get_lock_count(const uint8_t *data, int data_offset, ****************************************************************************/ uint64_t get_lock_offset(const uint8_t *data, int data_offset, - bool large_file_format, bool *err) + bool large_file_format) { uint64_t offset = 0; - *err = False; - if(!large_file_format) { offset = (uint64_t)IVAL(data,SMB_LKOFF_OFFSET(data_offset)); } else { @@ -7868,7 +7866,6 @@ void reply_lockingX(struct smb_request *req) int i; const uint8_t *data; bool large_file_format; - bool err; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; struct smbd_lock_element *ulocks; struct smbd_lock_element *locks; @@ -8003,17 +8000,8 @@ void reply_lockingX(struct smb_request *req) for(i = 0; i < (int)num_ulocks; i++) { ulocks[i].smblctx = get_lock_pid(data, i, large_file_format); ulocks[i].count = get_lock_count(data, i, large_file_format); - ulocks[i].offset = get_lock_offset(data, i, large_file_format, &err); + ulocks[i].offset = get_lock_offset(data, i, large_file_format); ulocks[i].brltype = UNLOCK_LOCK; - - /* - * There is no error code marked "stupid client bug".... :-). - */ - if(err) { - reply_nterror(req, NT_STATUS_ACCESS_DENIED); - END_PROFILE(SMBlockingX); - return; - } } /* Now do any requested locks */ @@ -8025,7 +8013,7 @@ void reply_lockingX(struct smb_request *req) for(i = 0; i < (int)num_locks; i++) { locks[i].smblctx = get_lock_pid(data, i, large_file_format); locks[i].count = get_lock_count(data, i, large_file_format); - locks[i].offset = get_lock_offset(data, i, large_file_format, &err); + locks[i].offset = get_lock_offset(data, i, large_file_format); if (locktype & LOCKING_ANDX_SHARED_LOCK) { if (locktype & LOCKING_ANDX_CANCEL_LOCK) { @@ -8040,15 +8028,6 @@ void reply_lockingX(struct smb_request *req) locks[i].brltype = WRITE_LOCK; } } - - /* - * There is no error code marked "stupid client bug".... :-). - */ - if(err) { - reply_nterror(req, NT_STATUS_ACCESS_DENIED); - END_PROFILE(SMBlockingX); - return; - } } status = smbd_do_unlocking(req, fsp, num_ulocks, ulocks); |