[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  8f4e39f s3: Fix g_lock_lock after the select/poll conversion
      from  220db5a s3-smbd: try to fix the irix build.

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


- Log -----------------------------------------------------------------
commit 8f4e39f6f7636ad36d686a52aaefc18a411a7f02
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 30 16:38:31 2011 +0200

    s3: Fix g_lock_lock after the select/poll conversion
    
    Without clustering we don't have an fd to listen on, and sys_poll
    needs one element of space
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Wed Mar 30 18:36:50 CEST 2011 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 7a9161e..184da9b 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -397,7 +397,7 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name,
 			status = NT_STATUS_NO_MEMORY;
 			break;
 		}
-		num_pollfds = 1;
+		num_pollfds = 0;
 
 #ifdef CLUSTER_SUPPORT
 		if (lp_clustering()) {


-- 
Samba Shared Repository