ctdb-scripts: Don't bother checking PID file when starting ctdbd

[vlendec/samba-autobuild/.git] / ctdb / tcp / tcp_io.c

diff --git a/ctdb/tcp/tcp_io.c b/ctdb/tcp/tcp_io.c
index bba35decf51ed458e0bc970d0223bfc9442f4afc..5bb4b5bd1a7bdd54425f599a824f62345d8bc3a6 100644 (file)
--- a/ctdb/tcp/tcp_io.c
+++ b/ctdb/tcp/tcp_io.c
@@ -17,13 +17,18 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "lib/tevent/tevent.h"
-#include "lib/util/dlinklist.h"
-#include "lib/tdb/include/tdb.h"
+#include "replace.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "../include/ctdb_private.h"
+
+#include "lib/util/dlinklist.h"
+#include "lib/util/debug.h"
+
+#include "ctdb_private.h"
+
+#include "common/common.h"
+#include "common/logging.h"
+
 #include "ctdb_tcp.h"
 
 
@@ -64,7 +69,7 @@ void ctdb_tcp_read_cb(uint8_t *data, size_t cnt, void *args)
                goto failed;
        }
 
-       if (hdr->ctdb_version != CTDB_VERSION) {
+       if (hdr->ctdb_version != CTDB_PROTOCOL) {
                DEBUG(DEBUG_ALERT, (__location__ " Bad CTDB version 0x%x rejected\n", 
                          hdr->ctdb_version));
                goto failed;