From: Volker Lendecke <vl@samba.org>
Date: Fri, 9 Jun 2017 06:48:21 +0000 (+0200)
Subject: lib: Use ctdb_protocol instead of ctdb_private
X-Git-Tag: tdb-1.3.14~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38581bc116ebf9d622d99988ca785c2d353c75d6;p=thirdparty%2Fsamba.git

lib: Use ctdb_protocol instead of ctdb_private

ctdb_private is much broader. Right now we implement the protocol
ourselves. In the future, we might switch to the native ctdb
client implementation defined in ctdb_client.h, but that's a
different project :-)

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Jun 24 05:33:41 CEST 2017 on sn-devel-144
---

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index ce41db9e7d0..3adb57da247 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -35,11 +35,10 @@
 #include "lib/util/tevent_unix.c"
 #include "lib/util/sys_rw.h"
 #include "lib/util/blocking.h"
+#include "ctdb/include/ctdb_protocol.h"
 
 /* paths to these include files come from --with-ctdb= in configure */
 
-#include "ctdb_private.h"
-
 struct ctdbd_srvid_cb {
 	uint64_t srvid;
 	int (*cb)(uint32_t src_vnn, uint32_t dst_vnn,
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 3334eca5523..8e303e6e1c4 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -27,7 +27,7 @@
 #include "dbwrap/dbwrap_rbt.h"
 #include "lib/param/param.h"
 
-#include "ctdb_private.h"
+#include "ctdb/include/ctdb_protocol.h"
 #include "ctdbd_conn.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_private.h"