diff options
| author | Jeremy Allison <jra@samba.org> | 2009-02-13 16:07:07 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-02-13 16:07:07 -0800 |
| commit | 4df9f1860ed63ff88ee6c47596faa293cc9330bd (patch) | |
| tree | 148ab362db021d16bde26a72fc2a156bbe1e746d | |
| parent | 49b52ec16f8150d71a0ebfdd0a7067981fe5840a (diff) | |
| parent | ca87726f81392e475ba86680a8735ee7d890c553 (diff) | |
| download | samba-4df9f1860ed63ff88ee6c47596faa293cc9330bd.tar.gz samba-4df9f1860ed63ff88ee6c47596faa293cc9330bd.tar.bz2 samba-4df9f1860ed63ff88ee6c47596faa293cc9330bd.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
| -rw-r--r-- | source3/locking/locking.c | 2 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 902b230e60..cc0295e749 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -328,8 +328,6 @@ NTSTATUS do_lock_cancel(files_struct *fsp, bool ok = False; struct byte_range_lock *br_lck = NULL; - SMB_ASSERT(blr); - if (!fsp->can_lock) { return fsp->is_directory ? NT_STATUS_INVALID_DEVICE_REQUEST : NT_STATUS_INVALID_HANDLE; diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 1ed5e7229e..1ceda99fa7 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -6950,7 +6950,7 @@ void reply_lockingX(struct smb_request *req) fsp->fsp_name, (int)lock_timeout )); if (locktype & LOCKING_ANDX_CANCEL_LOCK) { - struct blocking_lock_record *blr; + struct blocking_lock_record *blr = NULL; if (lp_blocking_locks(SNUM(conn))) { |