[SCM] CTDB repository - branch master updated - ctdb-2.2-11-g5f8547b
Amitay Isaacs
amitay at samba.org
Sun Jun 16 18:53:45 MDT 2013
The branch, master has been updated
via 5f8547b1531bba4950b3d873a997585c3a16d31e (commit)
via 02c63c591cc273122b3a547bb301b92f0e4bd217 (commit)
via f8bf99de3a5f56be67aaa67ed836458b1cf73e86 (commit)
via 14a79c0f3967c88f8ffc8200d122f6c5ffdb63a8 (commit)
via edb2a3556d03e248b42f63dd2c62382b723bc98f (commit)
from cd4358b01c6c3d413b431f5760029d2b163b9c03 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5f8547b1531bba4950b3d873a997585c3a16d31e
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Jun 13 12:55:29 2013 +1000
packaging: Update the minimum required library versions
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
commit 02c63c591cc273122b3a547bb301b92f0e4bd217
Author: Amitay Isaacs <amitay at gmail.com>
Date: Fri Jun 7 11:24:17 2013 +1000
build: Enable VERBOSE option to display build command line
make V=1 or make VERBOSE=1 will display build commands.
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
commit f8bf99de3a5f56be67aaa67ed836458b1cf73e86
Author: Mathieu Parent <math.parent at gmail.com>
Date: Thu Jun 6 21:58:02 2013 +0200
build: Fix tdb.h path to enable building with system TDB library
commit 14a79c0f3967c88f8ffc8200d122f6c5ffdb63a8
Author: Mathieu Parent <math.parent at gmail.com>
Date: Thu Jun 6 21:43:08 2013 +0200
libctdb: Include config.h in libctdb/ctdb.c
Bug-Debian: http://bugs.debian.org/703551
commit edb2a3556d03e248b42f63dd2c62382b723bc98f
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Jun 6 16:42:02 2013 +1000
ctdbd: Make sure we don't kill init process by mistake
If getpgrp() fails, it will return -1 and that will send KILL signal to init
process (PID 1). This does not happen on RHEL, but does on AIX.
Reported-by: Chris Cowan <cc at us.ibm.com>
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 86 +++++++++++++++++++++++-------------------
client/ctdb_client.c | 2 +-
common/ctdb_io.c | 2 +-
common/ctdb_logging.c | 2 +-
common/ctdb_ltdb.c | 2 +-
common/ctdb_message.c | 2 +-
common/ctdb_util.c | 2 +-
lib/util/db_wrap.c | 2 +-
libctdb/ctdb.c | 1 +
packaging/RPM/ctdb.spec.in | 6 +-
server/ctdb_banning.c | 2 +-
server/ctdb_call.c | 2 +-
server/ctdb_control.c | 2 +-
server/ctdb_daemon.c | 2 +-
server/ctdb_freeze.c | 2 +-
server/ctdb_ltdb_server.c | 2 +-
server/ctdb_persistent.c | 2 +-
server/ctdb_recover.c | 2 +-
server/ctdb_server.c | 2 +-
server/ctdb_takeover.c | 2 +-
server/ctdb_traverse.c | 2 +-
server/ctdb_update_record.c | 2 +-
server/ctdb_vacuum.c | 2 +-
server/eventscript.c | 9 ++++-
tcp/tcp_connect.c | 2 +-
tcp/tcp_init.c | 2 +-
tcp/tcp_io.c | 2 +-
tests/src/ctdbd_test.c | 2 +-
28 files changed, 83 insertions(+), 67 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index bfeccf8..4fdd1af 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,6 +50,14 @@ PMDA_LIBS = -lpcp -lpcp_pmda
PMDA_INSTALL = @CTDB_PMDA_INSTALL@
PMDA_DEST_DIR = /var/lib/pcp/pmdas/ctdb
+WRAPPER=@
+ifeq ($(V),1)
+WRAPPER=
+endif
+ifeq ($(VERBOSE),1)
+WRAPPER=
+endif
+
ifeq ($(CC),gcc)
EXTRA_CFLAGS=-Wno-format-zero-length -fPIC
endif
@@ -145,139 +153,139 @@ showlayout::
.c.o:
@echo Compiling $*.c
@mkdir -p `dirname $@`
- @$(CC) $(CFLAGS) -c $< -o $@
+ $(WRAPPER) $(CC) $(CFLAGS) -c $< -o $@
dirs:
- @mkdir -p $(DIRS)
+ $(WRAPPER) mkdir -p $(DIRS)
$(CTDB_VERSION_H):
@echo Generating $@
- @./packaging/mkversion.sh
+ $(WRAPPER) ./packaging/mkversion.sh
bin/ctdbd: $(CTDB_SERVER_OBJ)
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
libctdb/libctdb.a: $(CTDB_LIB_OBJ)
@echo Linking $@
-rm -f libctdb.a
- @$(AR) $(ARFLAGS) libctdb/libctdb.a $(CTDB_LIB_OBJ)
- @$(RANLIB) libctdb/libctdb.a
+ $(WRAPPER) $(AR) $(ARFLAGS) libctdb/libctdb.a $(CTDB_LIB_OBJ)
+ $(WRAPPER) $(RANLIB) libctdb/libctdb.a
libctdb/libctdb.so.0: $(CTDB_LIB_OBJ)
@echo Linking $@
- @$(SHLD) -Wl,-soname=libctdb.so.0 $(CTDB_LIB_OBJ)
+ $(WRAPPER) $(SHLD) -Wl,-soname=libctdb.so.0 $(CTDB_LIB_OBJ)
libctdb/libctdb.so: libctdb/libctdb.so.0
@echo Creating $@
- - at rm -f libctdb/libctdb.so
- @ln -s libctdb.so.0 libctdb/libctdb.so
+ $(WRAPPER) rm -f libctdb/libctdb.so
+ $(WRAPPER) ln -s libctdb.so.0 libctdb/libctdb.so
bin/scsi_io: $(CTDB_CLIENT_OBJ) utils/scsi_io/scsi_io.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ utils/scsi_io/scsi_io.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ utils/scsi_io/scsi_io.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o tools/ctdb_vacuum.o libctdb/libctdb.a
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) libctdb/libctdb.a
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) libctdb/libctdb.a
bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ)
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS)
bin/ctdb_lock_helper: server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTERNAL_OBJ)
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTERNAL_OBJ) $(TDB_LIBS) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTERNAL_OBJ) $(TDB_LIBS) $(LIB_FLAGS)
bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ)
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ utils/smnotify/smnotify.o utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o $(POPT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ utils/smnotify/smnotify.o utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o $(POPT_OBJ) $(LIB_FLAGS)
utils/smnotify/smnotify.o: utils/smnotify/smnotify.c utils/smnotify/smnotify.h
utils/smnotify/smnotify.h: utils/smnotify/smnotify.x
@echo Generating $@
- rpcgen -h utils/smnotify/smnotify.x > utils/smnotify/smnotify.h
+ $(WRAPPER) rpcgen -h utils/smnotify/smnotify.x > utils/smnotify/smnotify.h
utils/smnotify/gen_xdr.c: utils/smnotify/smnotify.x utils/smnotify/smnotify.h
@echo Generating $@
- rpcgen -c utils/smnotify/smnotify.x | grep -Ev '^[[:space:]]+register int32_t \*buf;' > utils/smnotify/gen_xdr.c
+ $(WRAPPER) rpcgen -c utils/smnotify/smnotify.x | grep -Ev '^[[:space:]]+register int32_t \*buf;' > utils/smnotify/gen_xdr.c
utils/smnotify/gen_smnotify.c: utils/smnotify/smnotify.x utils/smnotify/smnotify.h
@echo Generating $@
- rpcgen -l utils/smnotify/smnotify.x > utils/smnotify/gen_smnotify.c
+ $(WRAPPER) rpcgen -l utils/smnotify/smnotify.x > utils/smnotify/gen_smnotify.c
bin/ping_pong: utils/ping_pong/ping_pong.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o $(LIB_FLAGS)
bin/pmdactdb: $(CTDB_CLIENT_OBJ) utils/pmda/pmda_ctdb.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ utils/pmda/pmda_ctdb.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) $(PMDA_LIBS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ utils/pmda/pmda_ctdb.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) $(PMDA_LIBS)
tests/bin/rb_test: $(CTDB_CLIENT_OBJ) tests/src/rb_test.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/rb_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/rb_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_bench: $(CTDB_CLIENT_OBJ) tests/src/ctdb_bench.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_bench.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_bench.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_fetch: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_fetch_one: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_one.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o $(CTDB_EXTERNAL_OBJ)
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
tests/bin/ctdb_fetch_readonly_once: libctdb/libctdb.a tests/src/ctdb_fetch_readonly_once.o $(CTDB_EXTERNAL_OBJ)
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
tests/bin/ctdb_fetch_readonly_loop: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_readonly_loop.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_loop.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_loop.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_trackingdb_test: $(CTDB_CLIENT_OBJ) tests/src/ctdb_trackingdb_test.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_trackingdb_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_trackingdb_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_update_record: $(CTDB_CLIENT_OBJ) tests/src/ctdb_update_record.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_update_record_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_update_record_persistent.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_store: $(CTDB_CLIENT_OBJ) tests/src/ctdb_store.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_store.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_store.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_traverse: $(CTDB_CLIENT_OBJ) tests/src/ctdb_traverse.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_traverse.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_traverse.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_randrec: $(CTDB_CLIENT_OBJ) tests/src/ctdb_randrec.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_randrec.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_randrec.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_persistent.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_porting_tests: $(CTDB_CLIENT_OBJ) tests/src/ctdb_porting_tests.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_porting_tests.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_porting_tests.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_transaction: $(CTDB_CLIENT_OBJ) tests/src/ctdb_transaction.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_transaction.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_transaction.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
CTDB_SERVER_MOST_OBJ = $(CTDB_SERVER_OBJ:server/ctdbd.o=)
CTDBD_TEST_C = $(CTDB_SERVER_MOST_OBJ:.o=.c) tests/src/ctdbd_test.c
@@ -291,23 +299,23 @@ tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c $(CTDBD_TEST_C)
tests/bin/ctdb_takeover_tests: $(CTDB_TEST_OBJ) tests/src/ctdb_takeover_tests.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_takeover_tests.o $(CTDB_TEST_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_takeover_tests.o $(CTDB_TEST_OBJ) $(LIB_FLAGS)
tests/src/ctdb_tool_libctdb.o: tests/src/ctdb_tool_libctdb.c tests/src/libctdb_test.c $(CTDB_TEST_C)
tests/bin/ctdb_tool_libctdb: $(CTDB_TEST_OBJ) tests/src/ctdb_tool_libctdb.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_libctdb.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_libctdb.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
tests/src/ctdb_tool_stubby.o: tests/src/ctdb_tool_stubby.c tests/src/libctdb_test.c $(CTDB_TEST_C)
tests/bin/ctdb_tool_stubby: $(CTDB_TEST_OBJ) tests/src/ctdb_tool_stubby.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_stubby.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_stubby.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
tests/bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
manpages:
$(MAKE) -C doc
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 334d830..51ca49b 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "db_wrap.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/common/ctdb_io.c b/common/ctdb_io.c
index 4e592b9..aee8864 100644
--- a/common/ctdb_io.c
+++ b/common/ctdb_io.c
@@ -21,7 +21,7 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/common/ctdb_logging.c b/common/ctdb_logging.c
index 408fda8..9b69b38 100644
--- a/common/ctdb_logging.c
+++ b/common/ctdb_logging.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "system/time.h"
#include "../include/ctdb_private.h"
#include "../include/ctdb_client.h"
diff --git a/common/ctdb_ltdb.c b/common/ctdb_ltdb.c
index dab88f3..0bfc377 100644
--- a/common/ctdb_ltdb.c
+++ b/common/ctdb_ltdb.c
@@ -19,7 +19,7 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "../include/ctdb_private.h"
diff --git a/common/ctdb_message.c b/common/ctdb_message.c
index b0d2ea0..0e19761 100644
--- a/common/ctdb_message.c
+++ b/common/ctdb_message.c
@@ -22,7 +22,7 @@
protocol design and packet details
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "../include/ctdb_private.h"
diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index a910a0c..d2bce36 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "system/wait.h"
diff --git a/lib/util/db_wrap.c b/lib/util/db_wrap.c
index 7e7e17f..07b066c 100644
--- a/lib/util/db_wrap.c
+++ b/lib/util/db_wrap.c
@@ -28,7 +28,7 @@
#include "includes.h"
#include "lib/util/dlinklist.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "db_wrap.h"
static struct tdb_wrap *tdb_list;
diff --git a/libctdb/ctdb.c b/libctdb/ctdb.c
index dd1b572..4462fe4 100644
--- a/libctdb/ctdb.c
+++ b/libctdb/ctdb.c
@@ -17,6 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
#include <sys/time.h>
#include <sys/socket.h>
#include <string.h>
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 44bd46f..b8627cd 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -31,9 +31,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
# If the above options are changed then mandate minimum system
# versions.
-%define libtalloc_version 2.0.6
-%define libtdb_version 1.2.9
-%define libtevent_version 0.9.13
+%define libtalloc_version 2.0.8
+%define libtdb_version 1.2.11
+%define libtevent_version 0.9.18
%if ! %with_included_talloc
BuildRequires: libtalloc-devel >= %{libtalloc_version}
diff --git a/server/ctdb_banning.c b/server/ctdb_banning.c
index 4e6db31..bb3facc 100644
--- a/server/ctdb_banning.c
+++ b/server/ctdb_banning.c
@@ -17,7 +17,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "system/time.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/server/ctdb_call.c b/server/ctdb_call.c
index a98903d..fe83bc1 100644
--- a/server/ctdb_call.c
+++ b/server/ctdb_call.c
@@ -21,7 +21,7 @@
protocol design and packet details
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index bf4a20d..229ccdd 100644
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -17,7 +17,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "system/wait.h"
diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
index cedee09..29c26f6 100644
--- a/server/ctdb_daemon.c
+++ b/server/ctdb_daemon.c
@@ -19,7 +19,7 @@
#include "includes.h"
#include "db_wrap.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/server/ctdb_freeze.c b/server/ctdb_freeze.c
index 88384f9..e65415c 100644
--- a/server/ctdb_freeze.c
+++ b/server/ctdb_freeze.c
@@ -17,7 +17,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "system/wait.h"
diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 0426d96..b5a27de 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "system/dir.h"
diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c
index 2b3da32..dcbb6e0 100644
--- a/server/ctdb_persistent.c
+++ b/server/ctdb_persistent.c
@@ -22,7 +22,7 @@
#include "system/filesys.h"
#include "system/wait.h"
#include "db_wrap.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "../include/ctdb_private.h"
struct ctdb_persistent_state {
diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index d7741ab..1c18aca 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -18,7 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "system/time.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/server/ctdb_server.c b/server/ctdb_server.c
index de3c690..d0c3461 100644
--- a/server/ctdb_server.c
+++ b/server/ctdb_server.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index fda7c56..679177e 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -19,7 +19,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/server/ctdb_traverse.c b/server/ctdb_traverse.c
index d9aed2b..8d8a517 100644
--- a/server/ctdb_traverse.c
+++ b/server/ctdb_traverse.c
@@ -21,7 +21,7 @@
#include "system/filesys.h"
#include "system/wait.h"
#include "db_wrap.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "../include/ctdb_private.h"
#include "lib/util/dlinklist.h"
diff --git a/server/ctdb_update_record.c b/server/ctdb_update_record.c
index 1543b46..ce8e8af 100644
--- a/server/ctdb_update_record.c
+++ b/server/ctdb_update_record.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "db_wrap.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
#include "ctdb_private.h"
struct ctdb_persistent_write_state {
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index d7527d4..1f2fb01 100644
--
CTDB repository
More information about the samba-cvs
mailing list