[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Fri Nov 2 08:41:03 MDT 2012
The branch, master has been updated
via 92e17d5 smb2_server: Fix typo in comment.
via d551b4a build(waf): Fail "configure --with-cluster-support" if ctdb support is not available.
via 5f1b540 s3-torture:test_ctdbconn: fix the build against older ctdb versions
via 541bde6 s3:ctdb library: fix the build against older ctdb versions
via bf269d6 build(waf): check if we have ctdb_protocol.h in the cluster checks
via d113d8a build(autoconf): check if we have ctdb_protocol.h in the cluster checks
via e5cce4f build(autoconf): fix check for ctdb_private.h
via 872f499 build(waf): fix the cluster(ctdb) build without system talloc installed
via f8e71d4 build(waf): fix a tab indentation to spaces
from 3ecbe8c docs-xml: fix use of <smbconfoption> tag (fix bug #9345)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 92e17d5fd0f075a71d1c8f579c11b4ce9bbf6fa6
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Nov 2 10:41:01 2012 +0100
smb2_server: Fix typo in comment.
Karolin
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Fri Nov 2 15:40:22 CET 2012 on sn-devel-104
commit d551b4ab4bb06dac7d90389febbc21c2afae8bca
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Oct 30 16:04:10 2012 +0100
build(waf): Fail "configure --with-cluster-support" if ctdb support is not available.
Currently, configure only warns if cluster support is not found.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 5f1b5404b8e642dd18b55e37793068216f668242
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Oct 30 16:45:30 2012 +0100
s3-torture:test_ctdbconn: fix the build against older ctdb versions
by checking if we have the ctdb_protocol.h and including ctdb_private.h otherwise.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 541bde605e8a1158411436c4f7fdc314dfdbff23
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Oct 17 16:54:33 2012 +0200
s3:ctdb library: fix the build against older ctdb versions
by checking if we have the ctdb_protocol.h and including ctdb_private.h otherwise.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
commit bf269d6b5a6783e2479ac455b8e085a5d8ad9e9e
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Oct 30 13:59:41 2012 +0100
build(waf): check if we have ctdb_protocol.h in the cluster checks
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
commit d113d8aea5411e5e0701891f44b95d6d916b1271
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Oct 30 13:26:24 2012 +0100
build(autoconf): check if we have ctdb_protocol.h in the cluster checks
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
commit e5cce4f47274a02b752e47e3d1f23d3f64f72123
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Oct 30 13:40:48 2012 +0100
build(autoconf): fix check for ctdb_private.h
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 872f499c55ac13befb357d3e8eca0f526ea14978
Author: Michael Adam <obnox at samba.org>
Date: Tue Oct 30 14:43:42 2012 +0100
build(waf): fix the cluster(ctdb) build without system talloc installed
This is analogous to the earlier patch for tdb.
It temporarily adds the talloc include path to the
includes search list for the ctdb-header configure checks.
Signed-off-by: Michael Adam <obnox at samba.org>
Tested-by: Björn Baumbach <bb at sernet.de>
commit f8e71d4b602e5e1cca9f8701df93328718d8a6eb
Author: Michael Adam <obnox at samba.org>
Date: Tue Oct 30 14:41:04 2012 +0100
build(waf): fix a tab indentation to spaces
Signed-off-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/configure.in | 4 +-
source3/lib/ctdb_conn.h | 5 ++++
source3/smbd/smb2_server.c | 2 +-
source3/torture/test_ctdbconn.c | 6 +++++
source3/wscript | 43 ++++++++++++++++++++++++++++++++------
5 files changed, 50 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index fb00fee..179d12d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4969,7 +4969,7 @@ ctdb_broken="no"
SAVED_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS} $CTDB_CPPFLAGS"
-AC_CHECK_HEADERS(ctdb.h ctdb_private.h,,,[
+AC_CHECK_HEADERS(ctdb.h ctdb_private.h ctdb_protocol.h ,,,[
#include "confdefs.h"
#define NO_CONFIG_H
#include "replace.h"
@@ -4989,7 +4989,7 @@ then
fi
if test "x$have_cluster_support" = "xyes" -a \
- "x$ac_cv_header_ctdb_h" != "xyes"
+ "x$ac_cv_header_ctdb_private_h" != "xyes"
then
have_cluster_support=no
ctdb_broken="ctdb_private.h is required for cluster support"
diff --git a/source3/lib/ctdb_conn.h b/source3/lib/ctdb_conn.h
index 9229536..0d648c7 100644
--- a/source3/lib/ctdb_conn.h
+++ b/source3/lib/ctdb_conn.h
@@ -23,7 +23,12 @@
#ifdef CLUSTER_SUPPORT
#include <tdb.h>
+
+#ifdef HAVE_CTDB_PROTOCOL_H
#include <ctdb_protocol.h>
+#else
+#include <ctdb_private.h>
+#endif
#else /* CLUSTER_SUPPORT */
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 8cf3a04..f486236 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -759,7 +759,7 @@ static void smb2_set_operation_credit(struct smbd_server_connection *sconn,
* more later. I was only able to trigger higher
* values, when using a very high credit charge.
*
- * TODO: scale up depending one load, free memory
+ * TODO: scale up depending on load, free memory
* or other stuff.
* Maybe also on the relationship between number
* of requests and the used sequence number.
diff --git a/source3/torture/test_ctdbconn.c b/source3/torture/test_ctdbconn.c
index 539e224..d018352 100644
--- a/source3/torture/test_ctdbconn.c
+++ b/source3/torture/test_ctdbconn.c
@@ -25,7 +25,13 @@
#include "ctdb_conn.h"
#include "lib/util/tevent_unix.h"
#include "tdb.h"
+
+#ifdef HAVE_CTDB_PROTOCOL_H
#include "ctdb_protocol.h"
+#else
+#include "ctdb_private.h"
+#endif
+
#include "messages.h"
struct ctdb_conn_test_state {
diff --git a/source3/wscript b/source3/wscript
index cc94053..96ab4de 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -43,7 +43,7 @@ def set_options(opt):
opt.SAMBA3_ADD_OPTION('aio-support')
opt.SAMBA3_ADD_OPTION('profiling-data', default=False)
- opt.SAMBA3_ADD_OPTION('cluster-support')
+ opt.SAMBA3_ADD_OPTION('cluster-support', default=None)
opt.add_option('--with-ctdb-dir',
help=("Directory under which ctdb is installed"),
@@ -1288,7 +1288,9 @@ main() {
#
# checking for clustering extensions (CTDB)
#
- if not Options.options.with_cluster_support:
+ if Options.options.with_cluster_support == False:
+ # configure is called with --without-cluster-support,
+ # so don't check for and build w/o ctdb support.
have_cluster_support = False
else:
@@ -1302,9 +1304,12 @@ main() {
else:
includes = ''
- if not conf.env.USING_SYSTEM_TDB:
+ if not conf.env.USING_SYSTEM_TDB:
includes = includes + ' ' + srcdir + '/lib/tdb/include'
+ if not conf.env.USING_SYSTEM_TALLOC:
+ includes = includes + ' ' + srcdir + '/lib/talloc'
+
have_cluster_support = True
ctdb_broken = ""
@@ -1364,6 +1369,28 @@ main() {
#include "replace.h"
#include "system/wait.h"
#include "system/network.h"
+ #define private #error __USED_RESERVED_WORD_private__
+ #include <talloc.h>
+ #include <tdb.h>
+ #include <ctdb.h>
+ #include <ctdb_protocol.h>
+
+ int main(void)
+ {
+ return 0;
+ }
+ ''',
+ 'HAVE_CTDB_PROTOCOL_H',
+ addmain=False,
+ includes=includes,
+ msg='Checking for header ctdb_protocol.h')
+
+ if have_cluster_support:
+ conf.CHECK_CODE('''
+ #define NO_CONFIG_H
+ #include "replace.h"
+ #include "system/wait.h"
+ #include "system/network.h"
#include <talloc.h>
#include <tdb.h>
#include <ctdb.h>
@@ -1494,14 +1521,16 @@ main() {
Logs.info("building with cluster support")
conf.DEFINE('CLUSTER_SUPPORT', 1);
else:
- if not Options.options.with_cluster_support:
- Logs.info("building without cluster support")
+ if Options.options.with_cluster_support == False:
+ Logs.info("building without cluster support (--without-cluster-support)")
+ elif Options.options.with_cluster_support == True:
+ Logs.error("Cluster support not available: " + ctdb_broken)
+ conf.fatal("Cluster support not found, but --with-cluster-support was specified")
else:
- Logs.warn("building without cluster support: " + ctdb_broken)
+ Logs.info("building without cluster support: " + ctdb_broken)
conf.undefine('CLUSTER_SUPPORT')
-
conf.CHECK_CODE('__attribute__((destructor)) static void cleanup(void) { }',
'HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR',
addmain=False,
--
Samba Shared Repository
More information about the samba-cvs
mailing list