summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Kirsch <zack.kirsch@isilon.com>2009-02-13 15:35:21 -0800
committerTim Prouty <tprouty@samba.org>2009-02-13 15:59:39 -0800
commitca87726f81392e475ba86680a8735ee7d890c553 (patch)
tree4c5512812a3485b8c6685173bcbe62c48a35fbe5
parentf6821a15a05248f185bb6cdd1aeb588504f12d61 (diff)
downloadsamba-ca87726f81392e475ba86680a8735ee7d890c553.tar.gz
samba-ca87726f81392e475ba86680a8735ee7d890c553.tar.bz2
samba-ca87726f81392e475ba86680a8735ee7d890c553.zip
s3: Fix uninitialized variable warning (and bug).
-rw-r--r--source3/locking/locking.c2
-rw-r--r--source3/smbd/reply.c2
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))) {