s3-messages: only include messages.h where needed.

Guenther

diff --git a/lib/util/debug_s3.c b/lib/util/debug_s3.c
index b81daea5a7a3d718e8ccf8727a0e612d644c33a8..cfb675583cbd6c765280e9ce3bb4dc861a446111 100644 (file)
--- a/lib/util/debug_s3.c
+++ b/lib/util/debug_s3.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 /* This is the Samba3-specific implementation of reopen_logs(), which
  * calls out to the s3 loadparm code, and means that we don't depend

diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index 9530d1e3fcfca16fbf8c3f869a63781b73295921..ef291fb4ad6627709973bea2c7faf4580580ab51 100644 (file)
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -21,6 +21,8 @@
 #define _CTDBD_CONN_H
 
 struct ctdbd_connection;
+struct messaging_context;
+struct messaging_rec;
 
 NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
                                    struct ctdbd_connection **pconn);

diff --git a/source3/include/includes.h b/source3/include/includes.h
index fc16866df8955ef113a44fa0a8eca37d0caf3d6a..a46025a54d536a904d278f26b8497dbd95e065e7 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -535,7 +535,6 @@ typedef char fstring[FSTRING_LEN];
 #include "dynconfig.h"
 #include "debugparse.h"
 #include "../libcli/security/privileges.h"
-#include "messages.h"
 #include "locking.h"
 #include "smb_perfcount.h"
 #include "smb.h"

diff --git a/source3/include/locking.h b/source3/include/locking.h
index 5504da6dc3214d35add032fc970e038e89e0dc12..77a04eee2b6170253f09f6c2e2966505f88d905a 100644 (file)
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -31,6 +31,8 @@ enum brl_flavour {WINDOWS_LOCK = 0, POSIX_LOCK = 1};
 
 #define IS_PENDING_LOCK(type) ((type) == PENDING_READ_LOCK || (type) == PENDING_WRITE_LOCK)
 
+#include "librpc/gen_ndr/server_id.h"
+
 /* This contains elements that differentiate locks. The smbpid is a
    client supplied pid, and is essentially the locking context for
    this client */

diff --git a/source3/include/smb.h b/source3/include/smb.h
index f62da84a4f2630aeaaa97dc79554ad2a3b84d08e..338cd5b5e7cc33a44608e289489001186d183f26 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -621,6 +621,8 @@ struct pending_message_list {
 
 #define SHARE_MODE_FLAG_POSIX_OPEN     0x1
 
+#include "librpc/gen_ndr/server_id.h"
+
 /* struct returned by get_share_modes */
 struct share_mode_entry {
        struct server_id pid;

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 16e8cb915e034601a010c06f65fa43b3fafc929e..cc2f99782af22625895e6a0c5711abd06c231594 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_messaging.h"
 #include "ctdbd_conn.h"
 #include "packet.h"
+#include "messages.h"
 
 /* paths to these include files come from --with-ctdb= in configure */
 #include "ctdb.h"

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 9b0b66c1f0f3993d6ef5f7cf09d3013129784805..835f1cf04ee979b773581e204f1e0ac4ddad2a6a 100644 (file)
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -25,6 +25,7 @@
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"
 #include "g_lock.h"
+#include "messages.h"
 
 struct db_ctdb_transaction_handle {
        struct db_ctdb_ctx *ctx;

diff --git a/source3/lib/dmallocmsg.c b/source3/lib/dmallocmsg.c
index 59f7c3bd7e3ea761603b487b4305cd2a0ac063e1..837994a6eafd2abfdeb385d15ca64cd0b17dd752 100644 (file)
--- a/source3/lib/dmallocmsg.c
+++ b/source3/lib/dmallocmsg.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 /**
  * @file dmallocmsg.c

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 59f1d590b64cf639cf95cdc4ac389632ceb5c25b..c9e16d0f772d7508865a7c69cca067eba963ace5 100644 (file)
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -24,6 +24,7 @@
 #include "ctdbd_conn.h"
 #include "../lib/util/select.h"
 #include "system/select.h"
+#include "messages.h"
 
 static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name,
                                    struct server_id pid);

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 1bf2cf868580a4c9ea46c7bfd754fceb954385ed..db916674c639433c2a800890541f9c8fe8b4d13c 100644 (file)
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -50,6 +50,7 @@
 #include "librpc/gen_ndr/ndr_messaging.h"
 #include "dbwrap.h"
 #include "serverid.h"
+#include "messages.h"
 
 struct messaging_callback {
        struct messaging_callback *prev, *next;

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 871334649db0b753a53875244a5b3e52fc1581af..96a33abf50957f391c9072058dd13ee020fcab98 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "messages.h"
 
 #ifdef CLUSTER_SUPPORT
 

diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 9b3a7ed7c7620d6be9ac309414e9211d6a18bbbc..4bcae544e21f244bdf96d7dc7415913372edeb1e 100644 (file)
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -46,6 +46,7 @@
 #include "system/filesys.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "librpc/gen_ndr/ndr_messaging.h"
+#include "messages.h"
 
 struct messaging_tdb_context {
        struct messaging_context *msg_ctx;

diff --git a/source3/lib/server_contexts.c b/source3/lib/server_contexts.c
index f8fe9dceacb34b6280458836a56158c861a04c76..a95ea9acc2ac0816aba4df0305b46ca5b345638e 100644 (file)
--- a/source3/lib/server_contexts.c
+++ b/source3/lib/server_contexts.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "messages.h"
 
 struct tevent_context *server_event_ctx = NULL;
 

diff --git a/source3/lib/tallocmsg.c b/source3/lib/tallocmsg.c
index 6cea757457028eb2eff3bf87098acd7aaf08597c..a90d973151baaf8cc16c1d1c3e3a1a169458ebc6 100644 (file)
--- a/source3/lib/tallocmsg.c
+++ b/source3/lib/tallocmsg.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 /**
  * @file tallocmsg.c

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 973670ede08dc24748ca2073fe8b33c652d127a8..4e17e1e1302c42730d71f023fcc2064df11d27c7 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -28,6 +28,7 @@
 #include "secrets.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/util_pw.h"
+#include "messages.h"
 
 /* Max allowable allococation - 256mb - 0x10000000 */
 #define MAX_ALLOC_SIZE (1024*1024*256)

diff --git a/source3/lib/util_sconn.c b/source3/lib/util_sconn.c
index a98c046adae3f8d93952e6d9cbcaa803993284c5..51ba29e7886ffbfce184c1d59670e78fa01e1842 100644 (file)
--- a/source3/lib/util_sconn.c
+++ b/source3/lib/util_sconn.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "messages.h"
 
 struct server_id sconn_server_id(const struct smbd_server_connection *sconn)
 {

diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index 3ae4baa3c3c7a84d03fd5a0410797be8442ae1e9..6d371f4afd29a677bb45dbfbb84a9a928afeff3a 100644 (file)
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -29,6 +29,7 @@
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "../libcli/security/security.h"
+#include "messages.h"
 
 /**
  * Fix up the delta, dealing with encryption issues so that the final

diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index 78f9ea0692cd543035c0a018416256e0b358cfa4..128555d544923232674b93bf353d886a5d09af80 100644 (file)
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "libsmb/clidgram.h"
 #include "libsmb/nmblib.h"
+#include "messages.h"
 
 /*
  * cli_send_mailslot, send a mailslot for client code ...

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index c09b10e271f470ce83936e734da33b1ad856a66e..b2409acd7d40c12be0813dd92f72a39f9c83f4bf 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -31,6 +31,7 @@
 #include "smbd/globals.h"
 #include "dbwrap.h"
 #include "serverid.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index e541c04025c68ca5b09d11a1ae07d849bfede4f5..14a2c24f708fafc93e2b426fc10ff5911e196266 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -43,6 +43,7 @@
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
 #include "serverid.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index ac199c50517484359f2abf9f21f4ffde6f0cdd19..8f6af875dae27638b62ed243d62efbd673f69741 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "nmbd/nmbd.h"
 #include "serverid.h"
+#include "messages.h"
 
 int ClientNMB       = -1;
 int ClientDGRAM     = -1;

diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index f1a7e4f928cc40a9002692233e05b0a3153ccb84..db727e0b4f738eb8f82dcf16e471928848510705 100644 (file)
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -25,6 +25,7 @@
 #include "../librpc/gen_ndr/spoolss.h"
 #include "nt_printing.h"
 #include "printing/notify.h"
+#include "messages.h"
 
 static TALLOC_CTX *send_ctx;
 

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index f82256d794c5401c2044bc08bb2b46d892bdca37..df1120121dde30c6f6549713b3e3af631898602a 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -36,6 +36,7 @@
 #include "passdb/machine_sid.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "messages.h"
 
 /* Map generic permissions to printer object specific permissions */
 

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 1dd053f69ed39cadf416fbddd5f74afff271f026..8aa2ac87b6b68f84fa3b3ca2f5a312e4058a561c 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -32,6 +32,7 @@
 #include "serverid.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "messages.h"
 
 extern struct current_user current_user;
 extern userdom_struct current_user_info;

diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index e6991c6f0fb8641256bf0b3dfdf83db46710add3..00ca0801090399761c463931e4031901470404fc 100644 (file)
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -22,6 +22,7 @@
 #include "locking/proto.h"
 
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 #include "include/printing.h"
 #include "printing/nt_printing_migrate.h"
 #include "librpc/gen_ndr/srv_winreg.h"

diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index c2704a1f0efc085373a7201b45afd259896f171f..f081e1bbd7855c93f035a54e5119968f85b87696 100644 (file)
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 #ifdef WITH_PROFILE
 #define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)

diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index 0cafccb4c0e2116546b4664462f5c7822b69d942..011bfa87007d3d417089e3b613e605f9592243e1 100644 (file)
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/srv_epmapper.h"
 #include "rpc_server/rpc_server.h"
 #include "rpc_server/epmapper/srv_epmapper.h"
+#include "messages.h"
 
 #define DAEMON_NAME "epmd"
 

diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index dad4fcbdc7a4a4bd41a4ec1d4feff68845b92c88..c2dbdc2b2f6d33d011de26d1cb9936d4b704f821 100644 (file)
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -45,6 +45,7 @@
 #include "../libcli/registry/util_reg.h"
 #include "passdb.h"
 #include "auth.h"
+#include "messages.h"
 
 extern userdom_struct current_user_info;
 

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 4a114464cdc3359be3737c328bc26328abce6ac2..4735909b24c825af7fe8d28bb94282f390ca1810 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -48,6 +48,7 @@
 #include "../libcli/registry/util_reg.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "messages.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 01f3914827d7bea14ba548e17a723d968ff7344a..2faf22eebd4c184d6633a190836831f9d05efd7c 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -34,6 +34,7 @@
 #include "../lib/util/util_pw.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "messages.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 548a3f0845124ca85a77b76ea90f3e8770a2296a..999931e6408f1735e3766990884235526d307a9a 100644 (file)
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -21,6 +21,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index eb531ffaa9f9a8dd63af7c4629536ee2bbc6dcd2..a2e3d99ba8eaea3c6e4ccf79236921006e15e60a 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -28,6 +28,7 @@
 #include "fake_file.h"
 #include "transfer_file.h"
 #include "auth.h"
+#include "messages.h"
 
 /****************************************************************************
  Run a file if it is a magic script.

diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index 8a736993fbd5732af3a38e17ff226b67173fa197..63c1f5dcb5dee58ee12740f33ed3f57dcae8622a 100644 (file)
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -21,6 +21,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "memcache.h"
+#include "messages.h"
 
 #if defined(WITH_AIO)
 struct aio_extra *aio_list_head = NULL;

diff --git a/source3/smbd/msg_idmap.c b/source3/smbd/msg_idmap.c
index 1a3ccb19508912e82cd617f5322af0a65a606471..9bf15a9734719fa3187075e21fcb92c720a26841 100644 (file)
--- a/source3/smbd/msg_idmap.c
+++ b/source3/smbd/msg_idmap.c
@@ -35,6 +35,7 @@
 #include "idmap_cache.h"
 #include "passdb/lookup_sid.h"
 #include "auth.h"
+#include "messages.h"
 
 struct id {
        union {

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index e53504933c4d18bf70283c9a2f5effb858ac3d8f..d307c210c28db53e787b231e38c661a2bf97a9a6 100644 (file)
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -24,6 +24,7 @@
 #include "../libcli/auth/spnego.h"
 #include "serverid.h"
 #include "auth.h"
+#include "messages.h"
 
 extern fstring remote_proto;
 

diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 2fa6c76d48558c26191115848dfe686f90647623..2af98f2dfa097e02cff28642b8a1a8797ed0862a 100644 (file)
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -29,6 +29,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "dbwrap.h"
 #include "smbd/smbd.h"
+#include "messages.h"
 
 struct notify_context {
        struct db_context *db_recursive;

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index ae56bf8485da40d47aabec4868ce6f9b15cccd55..d6122ac91c3b452b42b6779a45f1a27df205cb86 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -29,6 +29,7 @@
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "auth.h"
+#include "messages.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index e43ed6b9a6adb8fcd993cd40cfc04cb1762d2a00..f87c6667a1a89c78492eeef08d089632e7890988 100644 (file)
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -24,6 +24,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 /****************************************************************************
  Get the number of current exclusive oplocks.

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 6060cc7b0b7f1eac0a69d89c909f34a152480bf2..843d4d519423add226b2ec9fd029e192bbf5c36d 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -31,6 +31,7 @@
 #include "system/select.h"
 #include "passdb.h"
 #include "auth.h"
+#include "messages.h"
 
 extern bool global_machine_password_needs_changing;
 

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index c8b45c12c8bb8cc8619e4086b2a6fd3a591ee41c..bdf5baf6681e5bfe4fd73cd541016a1967fe3019 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -40,6 +40,7 @@
 #include "serverid.h"
 #include "passdb.h"
 #include "auth.h"
+#include "messages.h"
 
 extern void start_epmd(struct tevent_context *ev_ctx,
                       struct messaging_context *msg_ctx);

diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index 4d7c3376ea15a1fb59ba10da8ed25bdc9bda873c..84213ae0e802e4204bb7e19858fe12638740e258 100644 (file)
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -29,6 +29,7 @@
 #include "printing/pcap.h"
 #include "printing/load.h"
 #include "auth.h"
+#include "messages.h"
 
 /****************************************************************************
  purge stale printers and reload from pre-populated pcap cache

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 4bbd790736b63f7fafbaca429b0e5d1178e4c528..b8f82c0aa2f369d0c717da1a7a25e4d50d15282c 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -33,6 +33,7 @@
 #include "libads/kerberos_proto.h"
 #include "../lib/util/asn1.h"
 #include "auth.h"
+#include "messages.h"
 
 /* For split krb5 SPNEGO blobs. */
 struct pending_auth_data {

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index a2742b8e2942f60db416e1efe8fc50efde9441d3..d4fbd1cdfe0e9139ae9836e6f46d94d5d8fe7134 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 struct smbd_smb2_lock_element {
        uint64_t offset;

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index c21213f23b38cb0206e0be9612fafdcd7fdc4163..bb3b0701199ac9e6b45683824d54424dde4a39f9 100644 (file)
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "memcache.h"
 #include "smbd/smbd.h"
+#include "messages.h"
 
 /****************************************************************************
  Stat cache code used in unix_convert.

diff --git a/source3/torture/msgtest.c b/source3/torture/msgtest.c
index adb45f75e3a64aabc671a842a749fdafc8f555c2..73344e56e3197c65de091b79eef04c723cee1b70 100644 (file)
--- a/source3/torture/msgtest.c
+++ b/source3/torture/msgtest.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 static int pong_count;
 

diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index f65964d7f9750df11e60eb9e790f24db2e797672..6809a0bc735602027e99edd44a5062b73a3fd47a 100644 (file)
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "dbwrap.h"
+#include "messages.h"
 
 typedef enum { OP_FETCH, OP_STORE, OP_DELETE, OP_ERASE, OP_LISTKEYS } dbwrap_op;
 

diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index e9bf98a078a7c14f289c52556741623e36a4e785..c1c286e5fff4fd5550132b22ac9074d2a5c13e3d 100644 (file)
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -23,6 +23,7 @@
 #include "system/filesys.h"
 #include "popt_common.h"
 #include "dbwrap.h"
+#include "messages.h"
 
 #if 0
 #include "lib/events/events.h"

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 9eace76661990108cedbfddbb9856f45850b0f5a..ec202bb87cc20a75f9d39c70437760fd1cdacbbc 100644 (file)
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -47,6 +47,7 @@
 #include "lib/netapi/netapi.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
+#include "messages.h"
 
 #ifdef WITH_FAKE_KASERVER
 #include "utils/net_afs.h"

diff --git a/source3/utils/net_g_lock.c b/source3/utils/net_g_lock.c
index 937c11c0c49e4c1ebb748c7c7a45806c2e4e24f7..6ed5d1776a63992858acdb73102f0e9b6b0041ac 100644 (file)
--- a/source3/utils/net_g_lock.c
+++ b/source3/utils/net_g_lock.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "net.h"
 #include "g_lock.h"
+#include "messages.h"
 
 static bool net_g_lock_init(TALLOC_CTX *mem_ctx,
                            struct tevent_context **pev,

diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index 335920195ec0ad5df09b52d35f2e30558d5ab0d7..d6027433a29c3708a4bc94ea5b64a525aa297f4d 100644 (file)
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -19,6 +19,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "session.h"
+#include "messages.h"
 
 int net_status_usage(struct net_context *c, int argc, const char **argv)
 {

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 4555954fd5d5673ed8e4287d9cfe2d37e22333b6..04aeb8d6bd5452b46f1de11afc19ac7cef9c22b5 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -31,6 +31,7 @@
 #include "nt_printing.h"
 #include "printing/notify.h"
 #include "libsmb/nmblib.h"
+#include "messages.h"
 
 #if HAVE_LIBUNWIND_H
 #include <libunwind.h>

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 18d338539d6c7442d5fe6ddf199f75f93abc881d..cf625fb73fadffd96a423b8eeab8052136516518 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -37,6 +37,7 @@
 #include "../libcli/security/security.h"
 #include "session.h"
 #include "locking/proto.h"
+#include "messages.h"
 
 #define SMB_MAXPIDS            2048
 static uid_t           Ucrit_uid = 0;               /* added by OH */

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 6e7dfce09a4eb071f6a6fc09ac8ee136a9d691b1..f383e70962404f2230670b30c38a5f7d84829202 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -35,6 +35,7 @@
 #include "lib/addrchange.h"
 #include "serverid.h"
 #include "auth.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index bb333b39ee3d0280ba3df4f2cb54c4c3c83f143f..23eaa243b85c10e4b61f600db1f29e44a2a421e0 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -75,6 +75,7 @@
 #include "secrets.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 2490073262eee1f14a4705de65faa17bdf208c7f..7d6a97477b65764f9a0a453053adaac121c3eff0 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -35,6 +35,7 @@
 #include "../lib/util/select.h"
 #include "../libcli/security/security.h"
 #include "system/select.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND