s3-messages: make ndr_messaging.h part of messages.h.

Guenther

40 files changed, 2 insertions, 42 deletions

diff --git a/source3/include/messages.h b/source3/include/messages.h
index 226c7c61b1..a78599055d 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -147,4 +147,6 @@ NTSTATUS messaging_send_buf(struct messaging_context *msg_ctx,
 void messaging_dispatch_rec(struct messaging_context *msg_ctx,
 			    struct messaging_rec *rec);
 
+#include "librpc/gen_ndr/ndr_messaging.h"
+
 #endif
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index cc2f99782a..8e0eeee9fa 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -22,8 +22,6 @@
 
 #ifdef CLUSTER_SUPPORT
 
-#include "librpc/gen_ndr/messaging.h"
-#include "librpc/gen_ndr/ndr_messaging.h"
 #include "ctdbd_conn.h"
 #include "packet.h"
 #include "messages.h"
diff --git a/source3/lib/dmallocmsg.c b/source3/lib/dmallocmsg.c
index 837994a6ea..889f4ed3db 100644
--- a/source3/lib/dmallocmsg.c
+++ b/source3/lib/dmallocmsg.c
@@ -17,7 +17,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "messages.h"
 
 /**
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index c9e16d0f77..7a9161e7a6 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "g_lock.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/select.h"
 #include "system/select.h"
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index db916674c6..4335554c2a 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -46,8 +46,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
-#include "librpc/gen_ndr/ndr_messaging.h"
 #include "dbwrap.h"
 #include "serverid.h"
 #include "messages.h"
diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 96a33abf50..3e2fde0b8f 100644
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -22,7 +22,6 @@
 
 #ifdef CLUSTER_SUPPORT
 
-#include "librpc/gen_ndr/messaging.h"
 #include "ctdb.h"
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"
diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 4bcae544e2..18074cdd92 100644
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -44,8 +44,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "librpc/gen_ndr/messaging.h"
-#include "librpc/gen_ndr/ndr_messaging.h"
 #include "messages.h"
 
 struct messaging_tdb_context {
diff --git a/source3/lib/tallocmsg.c b/source3/lib/tallocmsg.c
index a90d973151..da380c9335 100644
--- a/source3/lib/tallocmsg.c
+++ b/source3/lib/tallocmsg.c
@@ -17,7 +17,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "messages.h"
 
 /**
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index 128555d544..92f381e87b 100644
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "libsmb/clidgram.h"
 #include "libsmb/nmblib.h"
 #include "messages.h"
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 3f14b14923..ef7aab6a6a 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -22,7 +22,6 @@
 #include "libads/sitename_cache.h"
 #include "libads/dns.h"
 #include "../libcli/netlogon/netlogon.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "lib/async_req/async_sock.h"
 #include "libsmb/nmblib.h"
 
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index b2409acd7d..c325338062 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -27,7 +27,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "locking/proto.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "smbd/globals.h"
 #include "dbwrap.h"
 #include "serverid.h"
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 14a2c24f70..28f1aceb49 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -38,7 +38,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "locking/proto.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "smbd/globals.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 8f6af875da..f8108d9d52 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "popt_common.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "nmbd/nmbd.h"
 #include "serverid.h"
 #include "messages.h"
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index db727e0b4f..836f7df3d1 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "printing.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/spoolss.h"
 #include "nt_printing.h"
 #include "printing/notify.h"
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index df1120121d..5f10939670 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -20,7 +20,6 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "printing/pcap.h"
 #include "printing/nt_printing_tdb.h"
 #include "printing/nt_printing_migrate.h"
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 8aa2ac87b6..785e893d3a 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -23,7 +23,6 @@
 #include "system/syslog.h"
 #include "system/filesys.h"
 #include "printing.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/ndr_spoolss.h"
 #include "nt_printing.h"
 #include "../librpc/gen_ndr/netlogon.h"
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index 00ca080109..340bf0a5f1 100644
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -21,7 +21,6 @@
 #include "smbd/smbd.h"
 #include "locking/proto.h"
 
-#include "librpc/gen_ndr/messaging.h"
 #include "messages.h"
 #include "include/printing.h"
 #include "printing/nt_printing_migrate.h"
diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index f081e1bbd7..201da3e399 100644
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "messages.h"
 
 #ifdef WITH_PROFILE
diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index 011bfa8700..5e82b276fd 100644
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 
 #include "serverid.h"
-#include "../librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/srv_epmapper.h"
 #include "rpc_server/rpc_server.h"
 #include "rpc_server/epmapper/srv_epmapper.h"
diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index c2dbdc2b2f..734c004e66 100644
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -32,7 +32,6 @@
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "rpc_client/cli_lsarpc.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "../lib/crypto/md4.h"
 #include "rpc_client/init_lsa.h"
 #include "rpc_server/rpc_ncacn_np.h"
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 4735909b24..3280f638f7 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -34,7 +34,6 @@
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/init_spoolss.h"
 #include "rpc_client/cli_pipe.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "../libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "registry.h"
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 2faf22eebd..09163d401d 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -26,7 +26,6 @@
 #include "includes.h"
 #include "system/passwd.h"
 #include "../librpc/gen_ndr/srv_srvsvc.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "dbwrap.h"
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 999931e640..c208234bdc 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "messages.h"
 
 #undef DBGC_CLASS
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index a2e3d99ba8..aeed4e3c9d 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "printing.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
diff --git a/source3/smbd/msg_idmap.c b/source3/smbd/msg_idmap.c
index 9bf15a9734..b1ee60ff7f 100644
--- a/source3/smbd/msg_idmap.c
+++ b/source3/smbd/msg_idmap.c
@@ -30,7 +30,6 @@
 #include "memcache.h"
 #include "globals.h"
 #include "../libcli/security/dom_sid.h"
-#include "../librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "idmap_cache.h"
 #include "passdb/lookup_sid.h"
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 2af98f2dfa..a8eaf79392 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -26,7 +26,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_notify.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "dbwrap.h"
 #include "smbd/smbd.h"
 #include "messages.h"
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d6122ac91c..c03200e511 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -25,7 +25,6 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "auth.h"
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index f87c6667a1..087d6ef045 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "messages.h"
 
 /****************************************************************************
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 843d4d5194..f290e1d82b 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -23,7 +23,6 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/netlogon.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "../lib/async_req/async_sock.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/select.h"
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index bdf5baf668..e9332c1f14 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -26,7 +26,6 @@
 #include "popt_common.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "registry.h"
 #include "registry/reg_init_full.h"
 #include "libcli/auth/schannel.h"
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index d1ff7417de..554affc984 100644
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -25,7 +25,6 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "librpc/gen_ndr/messaging.h"
 
 #include "../librpc/gen_ndr/srv_dfs.h"
 #include "../librpc/gen_ndr/srv_dssetup.h"
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index 84213ae0e8..82b0cb03e9 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -24,7 +24,6 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "nt_printing.h"
 #include "printing/pcap.h"
 #include "printing/load.h"
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index b8f82c0aa2..b002fe90dd 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -28,7 +28,6 @@
 #include "../libcli/auth/spnego.h"
 #include "../libcli/auth/ntlmssp.h"
 #include "ntlmssp_wrap.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/krb5pac.h"
 #include "libads/kerberos_proto.h"
 #include "../lib/util/asn1.h"
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index d4fbd1cdfe..dcf1e0c6a5 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -23,7 +23,6 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "messages.h"
 
 struct smbd_smb2_lock_element {
diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index bb3b070119..40174c8034 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "memcache.h"
 #include "smbd/smbd.h"
 #include "messages.h"
diff --git a/source3/torture/msgtest.c b/source3/torture/msgtest.c
index 73344e56e3..607d4c3bb1 100644
--- a/source3/torture/msgtest.c
+++ b/source3/torture/msgtest.c
@@ -21,7 +21,6 @@
  */
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "messages.h"
 
 static int pong_count;
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 04aeb8d6bd..ea1b681588 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -26,7 +26,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "popt_common.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "librpc/gen_ndr/spoolss.h"
 #include "nt_printing.h"
 #include "printing/notify.h"
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index f383e70962..83324b0f95 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -27,7 +27,6 @@
 #include "winbindd.h"
 #include "nsswitch/winbind_client.h"
 #include "nsswitch/wb_reqtrans.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/srv_lsa.h"
 #include "../librpc/gen_ndr/srv_samr.h"
 #include "secrets.h"
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 23eaa243b8..dcb037b89b 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -69,7 +69,6 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/ndr_dssetup_c.h"
 #include "libads/sitename_cache.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "libsmb/clidgram.h"
 #include "ads.h"
 #include "secrets.h"
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 7d6a97477b..573a05cf06 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -30,7 +30,6 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "nsswitch/wb_reqtrans.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "secrets.h"
 #include "../lib/util/select.h"
 #include "../libcli/security/security.h"