s3-includes: only include ntdomain.h where needed.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index a46025a54d536a904d278f26b8497dbd95e065e7..9400c2d45f8702ac72c8b7b33462eff8a6709a85 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -541,7 +541,6 @@ typedef char fstring[FSTRING_LEN];
 #include "../lib/util/byteorder.h"
 
 #include "librpc/rpc/dcerpc.h"
-#include "ntdomain.h"
 #include "client.h"
 
 #include "module.h"

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6c179c982b1cc9ba253eb848c27ffb9865afa4ab..d83d0d297cae5299c0688c70ed4b33793b644548 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2814,6 +2814,7 @@ struct rpc_srv_callbacks {
        void *private_data;
 };
 
+struct api_struct;
 NTSTATUS rpc_srv_register(int version, const char *clnt,
                          const char *srv,
                          const struct ndr_interface_table *iface,

diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
index 7520d767ba1f9d60ba5f691e176fd33d32218cbe..7e6990c0adde6e37fa6eb0fc7f47e29827be38e9 100644 (file)
--- a/source3/librpc/rpc/dcerpc_helpers.c
+++ b/source3/librpc/rpc/dcerpc_helpers.c
@@ -28,6 +28,7 @@
 #include "ntlmssp_wrap.h"
 #include "librpc/crypto/gse.h"
 #include "librpc/crypto/spnego.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_PARSE

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

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 99405d3635caf7b171d85c8754fb0dbb640a4568..cf9e0e3666f8aac376d88cf31920654de8f64514 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -33,6 +33,7 @@
 #include "librpc/crypto/spnego.h"
 #include "rpc_dce.h"
 #include "cli_pipe.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_CLI

diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index fc154a3e19c468b9f632437bd069fb6fe5ad964c..f4cea9706405a1503136bb382e8489cff333fc14 100644 (file)
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"
+#include "ntdomain.h"
 
 /**********************************************************************
  convencience wrapper around rpccli_spoolss_OpenPrinterEx

diff --git a/source3/rpc_server/dfs/srv_dfs_nt.c b/source3/rpc_server/dfs/srv_dfs_nt.c
index ee9ac469c9a38f0eff4ce78a6696deaec2c43f1b..45e9d9a6ff308978288cfa705e2a1a93ea805335 100644 (file)
--- a/source3/rpc_server/dfs/srv_dfs_nt.c
+++ b/source3/rpc_server/dfs/srv_dfs_nt.c
@@ -26,6 +26,7 @@
 #include "msdfs.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_MSDFS

diff --git a/source3/rpc_server/dssetup/srv_dssetup_nt.c b/source3/rpc_server/dssetup/srv_dssetup_nt.c
index 53a3bdd8c4c9a26fe3cac4d0647fcffb326578da..73617df99f1f65dd57f6ca3edbede5efe73b5156 100644 (file)
--- a/source3/rpc_server/dssetup/srv_dssetup_nt.c
+++ b/source3/rpc_server/dssetup/srv_dssetup_nt.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_dssetup.h"
 #include "secrets.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/echo/srv_echo_nt.c b/source3/rpc_server/echo/srv_echo_nt.c
index 47952ef0b880bd4a967eafd1f326195bffedff44..7f27984b8bd038e10646782642c67fe2ecf636bc 100644 (file)
--- a/source3/rpc_server/echo/srv_echo_nt.c
+++ b/source3/rpc_server/echo/srv_echo_nt.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_echo.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c
index 530b0b7cc7f4e2771289b38ee8d680047c6a7fa2..d96fd1e929fab1c11b44b7858668025194340db7 100644 (file)
--- a/source3/rpc_server/epmapper/srv_epmapper.c
+++ b/source3/rpc_server/epmapper/srv_epmapper.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/srv_epmapper.h"
 #include "srv_epmapper.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 typedef uint32_t error_status_t;
 

diff --git a/source3/rpc_server/eventlog/srv_eventlog_nt.c b/source3/rpc_server/eventlog/srv_eventlog_nt.c
index cc935a51e8425fdbee5f008dc9c7118bbc33fb6b..2e1c1faa8c5fe849a8d8768eb744f5871761f5d0 100644 (file)
--- a/source3/rpc_server/eventlog/srv_eventlog_nt.c
+++ b/source3/rpc_server/eventlog/srv_eventlog_nt.c
@@ -30,6 +30,7 @@
 #include "rpc_client/cli_winreg.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/initshutdown/srv_initshutdown_nt.c b/source3/rpc_server/initshutdown/srv_initshutdown_nt.c
index e19ed284bfba8753ab306fa45cbd23272f0e3ce3..8644d95e7d0bf133a4cd6413764b7f1ff9892ff2 100644 (file)
--- a/source3/rpc_server/initshutdown/srv_initshutdown_nt.c
+++ b/source3/rpc_server/initshutdown/srv_initshutdown_nt.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_initshutdown.h"
 #include "../librpc/gen_ndr/srv_winreg.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index 3142e2dbf7d900446d2172e53af034b751556709..9f2c496bc5376d0d6edbcdc652a2dc2e7df95476 100644 (file)
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -43,6 +43,7 @@
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "passdb.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index 734c004e662b513aeef0e78bc5e1156dfae619cf..b17cfa2ffa61d854d6a0c1191542f2b5bdcc4a13 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 "passdb.h"
 #include "auth.h"
 #include "messages.h"
+#include "ntdomain.h"
 
 extern userdom_struct current_user_info;
 

diff --git a/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c b/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
index 57f642a0fe451daaebdf4aa2d37d86c205579f25..af80254a0b26f9cd091d87ae72e1621db8757b02 100644 (file)
--- a/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
+++ b/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
@@ -23,6 +23,7 @@
 #include "../librpc/gen_ndr/srv_ntsvcs.h"
 #include "services/svc_winreg_glue.h"
 #include "../libcli/registry/util_reg.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c
index ac84566f62a411abc63fcc51ef036dca71bb1134..889e87e9b5a97adfbed6f3b8066bb1f698600dd1 100644 (file)
--- a/source3/rpc_server/rpc_handles.c
+++ b/source3/rpc_server/rpc_handles.c
@@ -23,6 +23,7 @@
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "../librpc/gen_ndr/ndr_samr.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index 9afc16ff503902009622fbf0eef9bddc90271991..855eece538fba6435536c12a5b27946742f259a7 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -30,6 +30,7 @@
 #include "librpc/gen_ndr/auth.h"
 #include "../auth/auth_sam_reply.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index abbe5fa38958984241dd7de08c2ad49022c9060e..e3b6e6aa34e3b1cb558913b25679db07fad29a3f 100644 (file)
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -26,6 +26,7 @@
 #include "libcli/named_pipe_auth/npa_tstream.h"
 #include "../auth/auth_sam_reply.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #define SERVER_TCP_LOW_PORT  1024
 #define SERVER_TCP_HIGH_PORT 1300

diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 14d7750ff138f140a5eb7479245b9177b5054a3e..2d8564d78644c296d58377bd30d4806c45aa30d0 100644 (file)
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -43,6 +43,7 @@
 #include "../libcli/security/security.h"
 #include "passdb.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 3280f638f7275a8b748a5054d8c935012f79ecae..4a78aa4d1b2a5ebe31d794e21f373aa94c2cd1c3 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 "smbd/smbd.h"
 #include "auth.h"
 #include "messages.h"
+#include "ntdomain.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index a82367776435d4f5ca1ea203d20f9615c6aab03f..73a34866b20eab95b443af96418cf75c5f18ce9e 100644 (file)
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -40,6 +40,7 @@
 #include "rpc_dce.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 778fa81b865b8d71f09d6b9bb6282b0e57f43e5f..5252598726901810d6daf95e5c3f499c5854637e 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -28,6 +28,7 @@
 #include "fake_file.h"
 #include "rpc_dce.h"
 #include "rpc_server/rpc_ncacn_np.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 09163d401d3bc5495f81c99839362ee1f298ddf3..77627dc4099971a4af0444a022520ee013f138b2 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 "smbd/smbd.h"
 #include "auth.h"
 #include "messages.h"
+#include "ntdomain.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/rpc_server/svcctl/srv_svcctl_nt.c b/source3/rpc_server/svcctl/srv_svcctl_nt.c
index 62184bbe84bd5229c8680a658b019c4a11f208c4..a4eb282de7c796a0bbf9de7663838a147ecc1082 100644 (file)
--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
+++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
@@ -29,6 +29,7 @@
 #include "services/services.h"
 #include "services/svc_winreg_glue.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/winreg/srv_winreg_nt.c b/source3/rpc_server/winreg/srv_winreg_nt.c
index 081ddad390bb0fcc7127d2b7cc55a421f452661c..926d5d11eee5f0241734e8cdf3b6b6dca8c38061 100644 (file)
--- a/source3/rpc_server/winreg/srv_winreg_nt.c
+++ b/source3/rpc_server/winreg/srv_winreg_nt.c
@@ -28,6 +28,7 @@
 #include "registry/reg_perfcount.h"
 #include "rpc_misc.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
index a40922019925e65726836c777d2444accf1e80df..9459599cc655314d0d14c440a032525bd61f6c3b 100644 (file)
--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
@@ -31,6 +31,7 @@
 #include "session.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index e80bee748f8c154a7d3684bfea14d165dce40354..f60e860e1646bf163c9167ec42870f18ddd18343 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -31,6 +31,7 @@
 #include "../libcli/smbreadline/smbreadline.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
+#include "ntdomain.h"
 
 enum pipe_auth_type_spnego {
        PIPE_AUTH_TYPE_SPNEGO_NONE = 0,

diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index d85f92cf01bb86fb2eac09d2991dee9a236c7732..7938cc447a533bd6069a77c9e2515812dc4bdc73 100644 (file)
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -25,6 +25,7 @@
 #include "libcli/security/security.h"
 #include "passdb/lookup_sid.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 /* what user is current? */
 extern struct current_user current_user;

diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 20e5f52f62b5b12718be3cd24e33cf4d93e0d8ca..4073e0e2a95842e0bdbb2eff0ab754df7d1658f2 100644 (file)
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -26,6 +26,7 @@
 #include "registry/reg_objects.h"
 #include "../libcli/security/security.h"
 #include "../libcli/registry/util_reg.h"
+#include "ntdomain.h"
 
 /* support itanium as well */
 static const struct print_architecture_table_node archi_table[]= {

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

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 573a05cf067a908e83213d6287906974216cd481..0a1534cae1af7b0193238ad3c05ed18215f34e37 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -35,6 +35,7 @@
 #include "../libcli/security/security.h"
 #include "system/select.h"
 #include "messages.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_dual_ndr.c b/source3/winbindd/winbindd_dual_ndr.c
index e400b6110d4e73f98924f196c94aeebec32f7f99..003d3cded7a3b519d94181d4d3fdc692e47241cc 100644 (file)
--- a/source3/winbindd/winbindd_dual_ndr.c
+++ b/source3/winbindd/winbindd_dual_ndr.c
@@ -30,6 +30,7 @@
 #include "winbindd/winbindd.h"
 #include "winbindd/winbindd_proto.h"
 #include "librpc/gen_ndr/srv_wbint.h"
+#include "ntdomain.h"
 
 struct wbint_bh_state {
        struct winbindd_domain *domain;

diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index 0d3736b2b57eb0a15d14fa766fc38f5bb8b73479..f5a5739fe84744869e703d92aff236a423bfea9d 100644 (file)
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -28,6 +28,7 @@
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "idmap.h"
 #include "../libcli/security/security.h"
+#include "ntdomain.h"
 
 void _wbint_Ping(struct pipes_struct *p, struct wbint_Ping *r)
 {

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 52ffa235eb3e95957ce5474000d7d8ae2f9701ca..76e06d3735a2fe6a2bd224bf0795de9b63001b98 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -37,6 +37,7 @@
 #include "../librpc/gen_ndr/krb5pac.h"
 #include "passdb/machine_sid.h"
 #include "auth.h"
+#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND