[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  6214354... Fixed issue with return in a void function found by Björn JACKE <bj at SerNet.DE>
      from  7f2e59e... s4-ldb: add msg saying which build system is being used

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


- Log -----------------------------------------------------------------
commit 62143543cedd4fc0257d09fa656391479505740b
Author: Jeremy Allison <jra at samba.org>
Date:   Wed May 5 06:09:03 2010 -0700

    Fixed issue with return in a void function found by Björn JACKE <bj at SerNet.DE>
    
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 83898a3..9b20adf 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -709,7 +709,8 @@ void process_blocking_lock_queue(void)
 	struct blocking_lock_record *blr, *next = NULL;
 
 	if (sconn->allow_smb2) {
-		return process_blocking_lock_queue_smb2();
+		process_blocking_lock_queue_smb2();
+		return;
 	}
 
 	tv_curr = timeval_current();


-- 
Samba Shared Repository