[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-871-gca87726

[Tim Prouty]

The branch, master has been updated
       via  ca87726f81392e475ba86680a8735ee7d890c553 (commit)
      from  f6821a15a05248f185bb6cdd1aeb588504f12d61 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ca87726f81392e475ba86680a8735ee7d890c553
Author: Zack Kirsch <zack.kirsch at isilon.com>
Date:   Fri Feb 13 15:35:21 2009 -0800

    s3: Fix uninitialized variable warning (and bug).

-----------------------------------------------------------------------

Summary of changes:
 source3/locking/locking.c |    2 --
 source3/smbd/reply.c      |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 902b230..cc0295e 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 1ed5e72..1ceda99 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))) {
 


-- 
Samba Shared Repository