summaryrefslogtreecommitdiff
path: root/source4/cluster/ctdb
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-16 15:16:31 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-16 15:16:31 +0200
commit7111645d3c46e55b2c180e3db0ba8a3c670a3c31 (patch)
tree2c68d65b55dc5829939fbd960742da6cd35de9db /source4/cluster/ctdb
parentec1c854f2175823bd1ad39c2e272d1b3fab80bf1 (diff)
downloadsamba-7111645d3c46e55b2c180e3db0ba8a3c670a3c31.tar.gz
samba-7111645d3c46e55b2c180e3db0ba8a3c670a3c31.tar.bz2
samba-7111645d3c46e55b2c180e3db0ba8a3c670a3c31.zip
Use single copy of tdb in both samba3 and samba4.
Diffstat (limited to 'source4/cluster/ctdb')
-rw-r--r--source4/cluster/ctdb/client/ctdb_client.c2
-rw-r--r--source4/cluster/ctdb/common/ctdb_io.c2
-rw-r--r--source4/cluster/ctdb/common/ctdb_ltdb.c2
-rw-r--r--source4/cluster/ctdb/common/ctdb_message.c2
-rw-r--r--source4/cluster/ctdb/common/ctdb_util.c2
-rw-r--r--source4/cluster/ctdb/ctdb_cluster.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_call.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_control.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_daemon.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_freeze.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_lockwait.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_ltdb_server.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_recover.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_server.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_takeover.c2
-rw-r--r--source4/cluster/ctdb/server/ctdb_traverse.c2
-rw-r--r--source4/cluster/ctdb/takeover/ctdb_takeover.c2
-rw-r--r--source4/cluster/ctdb/tcp/tcp_connect.c2
-rw-r--r--source4/cluster/ctdb/tcp/tcp_init.c2
-rw-r--r--source4/cluster/ctdb/tcp/tcp_io.c2
20 files changed, 20 insertions, 20 deletions
diff --git a/source4/cluster/ctdb/client/ctdb_client.c b/source4/cluster/ctdb/client/ctdb_client.c
index 2af0d418a8..a22cd09745 100644
--- a/source4/cluster/ctdb/client/ctdb_client.c
+++ b/source4/cluster/ctdb/client/ctdb_client.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "tdb_wrap.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "lib/util/dlinklist.h"
#include "lib/events/events.h"
#include "system/network.h"
diff --git a/source4/cluster/ctdb/common/ctdb_io.c b/source4/cluster/ctdb/common/ctdb_io.c
index ca9c635878..ecdbeae516 100644
--- a/source4/cluster/ctdb/common/ctdb_io.c
+++ b/source4/cluster/ctdb/common/ctdb_io.c
@@ -21,7 +21,7 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "lib/events/events.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
diff --git a/source4/cluster/ctdb/common/ctdb_ltdb.c b/source4/cluster/ctdb/common/ctdb_ltdb.c
index 92adc4a12a..cae0aea0d9 100644
--- a/source4/cluster/ctdb/common/ctdb_ltdb.c
+++ b/source4/cluster/ctdb/common/ctdb_ltdb.c
@@ -19,7 +19,7 @@
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "../include/ctdb_private.h"
diff --git a/source4/cluster/ctdb/common/ctdb_message.c b/source4/cluster/ctdb/common/ctdb_message.c
index 1aea28fd35..28811b77f1 100644
--- a/source4/cluster/ctdb/common/ctdb_message.c
+++ b/source4/cluster/ctdb/common/ctdb_message.c
@@ -22,7 +22,7 @@
*/
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "../include/ctdb_private.h"
diff --git a/source4/cluster/ctdb/common/ctdb_util.c b/source4/cluster/ctdb/common/ctdb_util.c
index f11388331d..67eb32221a 100644
--- a/source4/cluster/ctdb/common/ctdb_util.c
+++ b/source4/cluster/ctdb/common/ctdb_util.c
@@ -19,7 +19,7 @@
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "../include/ctdb_private.h"
diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c
index ce295c4474..e782091eec 100644
--- a/source4/cluster/ctdb/ctdb_cluster.c
+++ b/source4/cluster/ctdb/ctdb_cluster.c
@@ -24,7 +24,7 @@
#include "cluster/cluster.h"
#include "system/filesys.h"
#include "cluster/cluster_private.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "include/ctdb.h"
#include "tdb_wrap.h"
#include "lib/util/dlinklist.h"
diff --git a/source4/cluster/ctdb/server/ctdb_call.c b/source4/cluster/ctdb/server/ctdb_call.c
index bbe07717ed..0d09241d52 100644
--- a/source4/cluster/ctdb/server/ctdb_call.c
+++ b/source4/cluster/ctdb/server/ctdb_call.c
@@ -22,7 +22,7 @@
*/
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/source4/cluster/ctdb/server/ctdb_control.c b/source4/cluster/ctdb/server/ctdb_control.c
index 4b826b5187..ba94b9dd24 100644
--- a/source4/cluster/ctdb/server/ctdb_control.c
+++ b/source4/cluster/ctdb/server/ctdb_control.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "system/wait.h"
diff --git a/source4/cluster/ctdb/server/ctdb_daemon.c b/source4/cluster/ctdb/server/ctdb_daemon.c
index f96cd86916..46e81ab3c3 100644
--- a/source4/cluster/ctdb/server/ctdb_daemon.c
+++ b/source4/cluster/ctdb/server/ctdb_daemon.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "lib/events/events.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
diff --git a/source4/cluster/ctdb/server/ctdb_freeze.c b/source4/cluster/ctdb/server/ctdb_freeze.c
index 2294266890..391c6b86d0 100644
--- a/source4/cluster/ctdb/server/ctdb_freeze.c
+++ b/source4/cluster/ctdb/server/ctdb_freeze.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "system/wait.h"
diff --git a/source4/cluster/ctdb/server/ctdb_lockwait.c b/source4/cluster/ctdb/server/ctdb_lockwait.c
index 2fc3e7a3ed..1112ab2054 100644
--- a/source4/cluster/ctdb/server/ctdb_lockwait.c
+++ b/source4/cluster/ctdb/server/ctdb_lockwait.c
@@ -21,7 +21,7 @@
#include "lib/events/events.h"
#include "system/filesys.h"
#include "system/wait.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "../include/ctdb_private.h"
diff --git a/source4/cluster/ctdb/server/ctdb_ltdb_server.c b/source4/cluster/ctdb/server/ctdb_ltdb_server.c
index 68ed546b27..cabdeb124c 100644
--- a/source4/cluster/ctdb/server/ctdb_ltdb_server.c
+++ b/source4/cluster/ctdb/server/ctdb_ltdb_server.c
@@ -19,7 +19,7 @@
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "../include/ctdb_private.h"
diff --git a/source4/cluster/ctdb/server/ctdb_recover.c b/source4/cluster/ctdb/server/ctdb_recover.c
index 6065016e1f..1e70d1de7a 100644
--- a/source4/cluster/ctdb/server/ctdb_recover.c
+++ b/source4/cluster/ctdb/server/ctdb_recover.c
@@ -19,7 +19,7 @@
*/
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "system/wait.h"
diff --git a/source4/cluster/ctdb/server/ctdb_server.c b/source4/cluster/ctdb/server/ctdb_server.c
index 1480127327..0cfbdc0f2f 100644
--- a/source4/cluster/ctdb/server/ctdb_server.c
+++ b/source4/cluster/ctdb/server/ctdb_server.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "lib/events/events.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
diff --git a/source4/cluster/ctdb/server/ctdb_takeover.c b/source4/cluster/ctdb/server/ctdb_takeover.c
index 42a23808dd..53a5a1dc3c 100644
--- a/source4/cluster/ctdb/server/ctdb_takeover.c
+++ b/source4/cluster/ctdb/server/ctdb_takeover.c
@@ -19,7 +19,7 @@
*/
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/source4/cluster/ctdb/server/ctdb_traverse.c b/source4/cluster/ctdb/server/ctdb_traverse.c
index 233de62e2b..d735594e73 100644
--- a/source4/cluster/ctdb/server/ctdb_traverse.c
+++ b/source4/cluster/ctdb/server/ctdb_traverse.c
@@ -21,7 +21,7 @@
#include "lib/events/events.h"
#include "system/filesys.h"
#include "system/wait.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "../include/ctdb_private.h"
typedef void (*ctdb_traverse_fn_t)(void *private_data, TDB_DATA key, TDB_DATA data);
diff --git a/source4/cluster/ctdb/takeover/ctdb_takeover.c b/source4/cluster/ctdb/takeover/ctdb_takeover.c
index 862382d90a..ae68725271 100644
--- a/source4/cluster/ctdb/takeover/ctdb_takeover.c
+++ b/source4/cluster/ctdb/takeover/ctdb_takeover.c
@@ -19,7 +19,7 @@
*/
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "system/wait.h"
diff --git a/source4/cluster/ctdb/tcp/tcp_connect.c b/source4/cluster/ctdb/tcp/tcp_connect.c
index 2f828e5717..3c167532ba 100644
--- a/source4/cluster/ctdb/tcp/tcp_connect.c
+++ b/source4/cluster/ctdb/tcp/tcp_connect.c
@@ -19,7 +19,7 @@
#include "includes.h"
#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "../include/ctdb_private.h"
diff --git a/source4/cluster/ctdb/tcp/tcp_init.c b/source4/cluster/ctdb/tcp/tcp_init.c
index f5d4e4c1d6..b8296d5244 100644
--- a/source4/cluster/ctdb/tcp/tcp_init.c
+++ b/source4/cluster/ctdb/tcp/tcp_init.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "lib/events/events.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/source4/cluster/ctdb/tcp/tcp_io.c b/source4/cluster/ctdb/tcp/tcp_io.c
index c10afb3425..d3afdc165a 100644
--- a/source4/cluster/ctdb/tcp/tcp_io.c
+++ b/source4/cluster/ctdb/tcp/tcp_io.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "lib/events/events.h"
#include "lib/util/dlinklist.h"
-#include "lib/tdb/include/tdb.h"
+#include "../tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
#include "../include/ctdb_private.h"