lib: Give messages_ctdbd.c its own header

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

diff --git a/source3/include/messages.h b/source3/include/messages.h
index ea89383e02d4db64e9c499b94706b7aa9e36aff4..806f7b0aadb7baa429250afcf6c4122a9ad8b703 100644 (file)
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -65,14 +65,6 @@ struct messaging_backend {
        void *private_data;
 };
 
-int messaging_ctdbd_init(struct messaging_context *msg_ctx,
-                        TALLOC_CTX *mem_ctx,
-                        struct messaging_backend **presult);
-int messaging_ctdbd_reinit(struct messaging_context *msg_ctx,
-                          TALLOC_CTX *mem_ctx,
-                          struct messaging_backend *backend);
-struct ctdbd_connection *messaging_ctdbd_connection(void);
-
 struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, 
                                         struct tevent_context *ev);
 NTSTATUS messaging_init_client(TALLOC_CTX *mem_ctx,

diff --git a/source3/lib/ctdb_dummy.c b/source3/lib/ctdb_dummy.c
index 0b1acb7dcdeda95eee63da59a38c1b23eff9a4dd..2ed7b102a622b2d4e544f97a01ae37218c4a4612 100644 (file)
--- a/source3/lib/ctdb_dummy.c
+++ b/source3/lib/ctdb_dummy.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "messages.h"
+#include "lib/messages_ctdbd.h"
 #include "ctdbd_conn.h"
 #include "lib/dbwrap/dbwrap.h"
 #include "lib/dbwrap/dbwrap_ctdb.h"

diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index feb9f5ebea28452c4d517402ba553e2a9f567b0c..55e0adb7b7198cfacb4c025a3804f42c8029a050 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -26,6 +26,7 @@
 #include "dbwrap/dbwrap_ctdb.h"
 #include "lib/param/param.h"
 #include "lib/cluster_support.h"
+#include "lib/messages_ctdbd.h"
 #include "util_tdb.h"
 #include "ctdbd_conn.h"
 #include "messages.h"

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 83def69cf54ac266fbcd6417ea4e548e3de9896e..a38f40e3345b61f3f4581dd5929f0090f09a2392 100644 (file)
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -53,6 +53,7 @@
 #include "lib/util/tevent_unix.h"
 #include "lib/background.h"
 #include "lib/messages_dgm.h"
+#include "lib/messages_ctdbd.h"
 #include "lib/util/iov_buf.h"
 #include "lib/util/server_id_db.h"
 #include "lib/messages_dgm_ref.h"

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index a32a80d224035c3b2ab1a01718b983e8da3a7c61..6ecec32eeba3819bfd820436238b465432f473d5 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "lib/messages_ctdbd.h"
 #include "lib/util/server_id.h"
 #include "messages.h"
 #include "util_tdb.h"

diff --git a/source3/lib/messages_ctdbd.h b/source3/lib/messages_ctdbd.h
new file mode 100644 (file)
index 0000000..67ec4b7
--- /dev/null
+++ b/source3/lib/messages_ctdbd.h
@@ -0,0 +1,38 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * messages_ctdb.c header
+ * Copyright (C) Volker Lendecke 2017
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _MESSAGES_CTDB_H_
+#define _MESSAGES_CTDB_H_
+
+#include "replace.h"
+#include <talloc.h>
+
+struct messaging_context;
+struct messaging_backend;
+struct ctdbd_connection;
+
+int messaging_ctdbd_init(struct messaging_context *msg_ctx,
+                        TALLOC_CTX *mem_ctx,
+                        struct messaging_backend **presult);
+int messaging_ctdbd_reinit(struct messaging_context *msg_ctx,
+                          TALLOC_CTX *mem_ctx,
+                          struct messaging_backend *backend);
+struct ctdbd_connection *messaging_ctdbd_connection(void);
+
+#endif

diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 7cc8b57cbc027ce9c88d5d573e2f87caed9ac416..fb32526fa6bc6838d19317110d1f572144fdf24a 100644 (file)
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -28,6 +28,7 @@
 #include "lib/param/param.h"
 #include "ctdbd_conn.h"
 #include "messages.h"
+#include "lib/messages_ctdbd.h"
 #include "lib/messages_dgm.h"
 
 struct serverid_key {

diff --git a/source3/smbd/notifyd/notifyd.h b/source3/smbd/notifyd/notifyd.h
index 82fdd6e987fe18633fa91ddbe73f20f811c64c6f..6904761af8f9f9d7dff143d88d968331203fd1f8 100644 (file)
--- a/source3/smbd/notifyd/notifyd.h
+++ b/source3/smbd/notifyd/notifyd.h
@@ -121,6 +121,7 @@ struct notify_event_msg {
 };
 
 struct sys_notify_context;
+struct ctdbd_connection;
 
 typedef int (*sys_notify_watch_fn)(TALLOC_CTX *mem_ctx,
                                   struct sys_notify_context *ctx,

diff --git a/source3/smbd/notifyd/notifydd.c b/source3/smbd/notifyd/notifydd.c
index 6856b3ea4f8dc918102014726a7306215856b8fa..ad3621a942c87bf0ce31a35064277599949668e5 100644 (file)
--- a/source3/smbd/notifyd/notifydd.c
+++ b/source3/smbd/notifyd/notifydd.c
@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include "notifyd.h"
+#include "lib/messages_ctdbd.h"
 #include <tevent.h>
 #include "lib/util/tevent_unix.h"
 

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index d5c03b941991df6c0bc6518bf9e48515c64c579b..a19b8b78b9b71646426c51ebe29ae858618e9729 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -32,6 +32,7 @@
 #include "passdb.h"
 #include "auth.h"
 #include "messages.h"
+#include "lib/messages_ctdbd.h"
 #include "smbprofile.h"
 #include "rpc_server/spoolss/srv_spoolss_nt.h"
 #include "libsmb/libsmb.h"

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 4883c4ec510b544b04be6a6a3af85e1a91a35fc6..fa13dbc9b18c7038e1fd08ae6c59cd415b3f00f4 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -40,6 +40,7 @@
 #include "passdb.h"
 #include "auth.h"
 #include "messages.h"
+#include "messages_ctdbd.h"
 #include "smbprofile.h"
 #include "lib/id_cache.h"
 #include "lib/param/param.h"

diff --git a/source3/torture/test_dbwrap_ctdb.c b/source3/torture/test_dbwrap_ctdb.c
index b9bab9eb9e6649a3972f4d7355a4a2967b926fb7..4512358bd93e822a3926932731d07ec1d6b311ea 100644 (file)
--- a/source3/torture/test_dbwrap_ctdb.c
+++ b/source3/torture/test_dbwrap_ctdb.c
@@ -23,6 +23,7 @@
 #include "lib/dbwrap/dbwrap.h"
 #include "lib/dbwrap/dbwrap_ctdb.h"
 #include "messages.h"
+#include "lib/messages_ctdbd.h"
 
 bool run_local_dbwrap_ctdb(int dummy)
 {