summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-03-24 22:33:07 +0100
committerGünther Deschner <gd@samba.org>2011-03-30 01:13:09 +0200
commit6e3f0d28a4c0bc79cdbe4cfb50d105c4fe479d2b (patch)
treef524231d9acb0117e288f0f0400a6bdc87931892
parent9115615663edf82afde5a3c934b53d53a0e508f0 (diff)
downloadsamba-6e3f0d28a4c0bc79cdbe4cfb50d105c4fe479d2b.tar.gz
samba-6e3f0d28a4c0bc79cdbe4cfb50d105c4fe479d2b.tar.bz2
samba-6e3f0d28a4c0bc79cdbe4cfb50d105c4fe479d2b.zip
s3-includes: only include ntdomain.h where needed.
Guenther
-rw-r--r--source3/include/includes.h1
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/librpc/rpc/dcerpc_helpers.c1
-rw-r--r--source3/printing/nt_printing.c1
-rw-r--r--source3/rpc_client/cli_pipe.c1
-rw-r--r--source3/rpc_client/cli_spoolss.c1
-rw-r--r--source3/rpc_server/dfs/srv_dfs_nt.c1
-rw-r--r--source3/rpc_server/dssetup/srv_dssetup_nt.c1
-rw-r--r--source3/rpc_server/echo/srv_echo_nt.c1
-rw-r--r--source3/rpc_server/epmapper/srv_epmapper.c1
-rw-r--r--source3/rpc_server/eventlog/srv_eventlog_nt.c1
-rw-r--r--source3/rpc_server/initshutdown/srv_initshutdown_nt.c1
-rw-r--r--source3/rpc_server/lsa/srv_lsa_nt.c1
-rw-r--r--source3/rpc_server/netlogon/srv_netlog_nt.c1
-rw-r--r--source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c1
-rw-r--r--source3/rpc_server/rpc_handles.c1
-rw-r--r--source3/rpc_server/rpc_ncacn_np.c1
-rw-r--r--source3/rpc_server/rpc_server.c1
-rw-r--r--source3/rpc_server/samr/srv_samr_nt.c1
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_nt.c1
-rw-r--r--source3/rpc_server/srv_pipe.c1
-rw-r--r--source3/rpc_server/srv_pipe_hnd.c1
-rw-r--r--source3/rpc_server/srvsvc/srv_srvsvc_nt.c1
-rw-r--r--source3/rpc_server/svcctl/srv_svcctl_nt.c1
-rw-r--r--source3/rpc_server/winreg/srv_winreg_nt.c1
-rw-r--r--source3/rpc_server/wkssvc/srv_wkssvc_nt.c1
-rw-r--r--source3/rpcclient/rpcclient.c1
-rw-r--r--source3/smbd/uid.c1
-rw-r--r--source3/utils/net_rpc_printer.c1
-rw-r--r--source3/winbindd/winbindd_cm.c1
-rw-r--r--source3/winbindd/winbindd_dual.c1
-rw-r--r--source3/winbindd/winbindd_dual_ndr.c1
-rw-r--r--source3/winbindd/winbindd_dual_srv.c1
-rw-r--r--source3/winbindd/winbindd_pam.c1
34 files changed, 33 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index a46025a54d..9400c2d45f 100644
--- 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 6c179c982b..d83d0d297c 100644
--- 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 7520d767ba..7e6990c0ad 100644
--- 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 5f10939670..46cfdb3b3a 100644
--- 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 99405d3635..cf9e0e3666 100644
--- 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 fc154a3e19..f4cea97064 100644
--- 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 ee9ac469c9..45e9d9a6ff 100644
--- 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 53a3bdd8c4..73617df99f 100644
--- 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 47952ef0b8..7f27984b8b 100644
--- 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 530b0b7cc7..d96fd1e929 100644
--- 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 cc935a51e8..2e1c1faa8c 100644
--- 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 e19ed284bf..8644d95e7d 100644
--- 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 3142e2dbf7..9f2c496bc5 100644
--- 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 734c004e66..b17cfa2ffa 100644
--- 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 57f642a0fe..af80254a0b 100644
--- 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 ac84566f62..889e87e9b5 100644
--- 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 9afc16ff50..855eece538 100644
--- 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 abbe5fa389..e3b6e6aa34 100644
--- 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 14d7750ff1..2d8564d786 100644
--- 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 3280f638f7..4a78aa4d1b 100644
--- 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 a823677764..73a34866b2 100644
--- 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 778fa81b86..5252598726 100644
--- 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 09163d401d..77627dc409 100644
--- 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 62184bbe84..a4eb282de7 100644
--- 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 081ddad390..926d5d11ee 100644
--- 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 a409220199..9459599cc6 100644
--- 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 e80bee748f..f60e860e16 100644
--- 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 d85f92cf01..7938cc447a 100644
--- 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 20e5f52f62..4073e0e2a9 100644
--- 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 dcb037b89b..1473d33721 100644
--- 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 573a05cf06..0a1534cae1 100644
--- 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 e400b6110d..003d3cded7 100644
--- 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 0d3736b2b5..f5a5739fe8 100644
--- 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 52ffa235eb..76e06d3735 100644
--- 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