r20991: use relative includes for ctdb headers. This works with both

standalone and built-in ctdb
(This used to be commit 3e5f29bddfd83914eeec706367b2b1bd30aba31e)

9 files changed, 9 insertions, 17 deletions

diff --git a/source4/cluster/ctdb/brlock_ctdb.c b/source4/cluster/ctdb/brlock_ctdb.c
index 35ea71b1af..429c719031 100644
--- a/source4/cluster/ctdb/brlock_ctdb.c
+++ b/source4/cluster/ctdb/brlock_ctdb.c
@@ -29,7 +29,7 @@
 #include "libcli/libcli.h"
 #include "cluster/cluster.h"
 #include "ntvfs/common/brlock.h"
-#include "cluster/ctdb/include/ctdb.h"
+#include "include/ctdb.h"
 
 #define ENABLE_NOTIFIES 0
 
diff --git a/source4/cluster/ctdb/common/ctdb.c b/source4/cluster/ctdb/common/ctdb.c
index ba00e7caa0..94715f6226 100644
--- a/source4/cluster/ctdb/common/ctdb.c
+++ b/source4/cluster/ctdb/common/ctdb.c
@@ -24,7 +24,7 @@
 #include "lib/util/dlinklist.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
 
 /*
   choose the transport we will use
diff --git a/source4/cluster/ctdb/common/ctdb_call.c b/source4/cluster/ctdb/common/ctdb_call.c
index aace5971e2..9b21ce7cb2 100644
--- a/source4/cluster/ctdb/common/ctdb_call.c
+++ b/source4/cluster/ctdb/common/ctdb_call.c
@@ -26,7 +26,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
 
 /*
   queue a packet or die
diff --git a/source4/cluster/ctdb/common/ctdb_ltdb.c b/source4/cluster/ctdb/common/ctdb_ltdb.c
index fbf6a3e567..10bcde43b5 100644
--- a/source4/cluster/ctdb/common/ctdb_ltdb.c
+++ b/source4/cluster/ctdb/common/ctdb_ltdb.c
@@ -23,7 +23,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
 #include "db_wrap.h"
 
 
diff --git a/source4/cluster/ctdb/common/ctdb_util.c b/source4/cluster/ctdb/common/ctdb_util.c
index 8e25759609..cf0c72a58b 100644
--- a/source4/cluster/ctdb/common/ctdb_util.c
+++ b/source4/cluster/ctdb/common/ctdb_util.c
@@ -23,7 +23,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
 
 /*
   return error string for last error
@@ -47,7 +47,6 @@ void ctdb_set_error(struct ctdb_context *ctdb, const char *fmt, ...)
 	va_end(ap);
 }
 
-
 /*
   a fatal internal error occurred - no hope for recovery
 */
diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c
index 0e7255f060..1d8d3a5252 100644
--- a/source4/cluster/ctdb/ctdb_cluster.c
+++ b/source4/cluster/ctdb/ctdb_cluster.c
@@ -26,7 +26,7 @@
 #include "system/filesys.h"
 #include "cluster/cluster_private.h"
 #include "lib/tdb/include/tdb.h"
-#include "cluster/ctdb/include/ctdb.h"
+#include "include/ctdb.h"
 #include "db_wrap.h"
 
 struct cluster_state {
diff --git a/source4/cluster/ctdb/tcp/tcp_connect.c b/source4/cluster/ctdb/tcp/tcp_connect.c
index 2404144ac1..e828bb7cbb 100644
--- a/source4/cluster/ctdb/tcp/tcp_connect.c
+++ b/source4/cluster/ctdb/tcp/tcp_connect.c
@@ -23,7 +23,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
 #include "ctdb_tcp.h"
 
 static void set_nonblocking(int fd)
diff --git a/source4/cluster/ctdb/tcp/tcp_init.c b/source4/cluster/ctdb/tcp/tcp_init.c
index b8ee8cb30e..0058e7ad85 100644
--- a/source4/cluster/ctdb/tcp/tcp_init.c
+++ b/source4/cluster/ctdb/tcp/tcp_init.c
@@ -23,7 +23,7 @@
 #include "lib/events/events.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
 #include "ctdb_tcp.h"
 
 /*
diff --git a/source4/cluster/ctdb/tcp/tcp_io.c b/source4/cluster/ctdb/tcp/tcp_io.c
index 82e24f7260..5385ad7f46 100644
--- a/source4/cluster/ctdb/tcp/tcp_io.c
+++ b/source4/cluster/ctdb/tcp/tcp_io.c
@@ -24,7 +24,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
 #include "ctdb_tcp.h"
 
 
@@ -210,13 +210,6 @@ int ctdb_tcp_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t length)
 	if (length2 != length) {
 		memset(data+length, 0, length2-length);
 	}
-	{
-		int i, fd = open("/dev/null", O_WRONLY);
-		for (i=0;i<length2;i++) {
-			write(fd, &data[i], 1);
-		}
-		close(fd);
-	}
 	
 	/* if the queue is empty then try an immediate write, avoiding
 	   queue overhead. This relies on non-blocking sockets */