[SCM] Samba Shared Repository - branch v3-6-test updated
Volker Lendecke
vlendec at samba.org
Wed Mar 30 10:39:31 MDT 2011
The branch, v3-6-test has been updated
via d9f71d0 s3: Fix g_lock_lock after the select/poll conversion
from 54afca7 s3-waf: fix spoolssd compile.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit d9f71d0b6a8dc9be89dc78dff081401940bfa57d
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
(cherry picked from commit 8f4e39f6f7636ad36d686a52aaefc18a411a7f02)
-----------------------------------------------------------------------
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 dfbcf84..35ff1f1 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -396,7 +396,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
More information about the samba-cvs
mailing list