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

Guenther

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

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);

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"

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 */

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;

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"

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;

source3/lib/dmallocmsg.c

@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 /**
  * @file dmallocmsg.c

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);

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;

source3/lib/messages_ctdbd.c

@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "messages.h"
 
 #ifdef CLUSTER_SUPPORT
 

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;

source3/lib/server_contexts.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "messages.h"
 
 struct tevent_context *server_event_ctx = NULL;
 

source3/lib/tallocmsg.c

@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 /**
  * @file tallocmsg.c

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)

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)
 {

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

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 ...

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

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

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;

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;
 

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 */
 

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;

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"

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)

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"
 

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;
 

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) \

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;
 

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

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.

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;

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 {

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;
 

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;

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;
 

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.

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;
 

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);

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

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 {

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;

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.

source3/torture/msgtest.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 static int pong_count;
 

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;
 

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"

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"

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,

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)
 {

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>

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 */

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

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

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