From 4ac2be99588b48b0652a524bf12fb1aa9c3f5fbb Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 7 Mar 2006 11:07:23 +0000 Subject: r13924: Split more prototypes out of include/proto.h + initial work on header file dependencies (This used to be commit 122835876748a3eaf5e8d31ad1abddab9acb8781) --- source4/rpc_server/common/common.h | 2 ++ source4/rpc_server/config.mk | 1 + source4/rpc_server/dcerpc_server.c | 1 + source4/rpc_server/dcerpc_sock.c | 2 ++ source4/rpc_server/dssetup/dcesrv_dssetup.c | 1 + source4/rpc_server/lsa/dcesrv_lsa.c | 3 +++ source4/rpc_server/netlogon/dcerpc_netlogon.c | 2 ++ source4/rpc_server/samr/dcesrv_samr.c | 2 ++ source4/rpc_server/samr/samr_password.c | 2 ++ 9 files changed, 16 insertions(+) (limited to 'source4/rpc_server') diff --git a/source4/rpc_server/common/common.h b/source4/rpc_server/common/common.h index a43ca74530..d0807d849d 100644 --- a/source4/rpc_server/common/common.h +++ b/source4/rpc_server/common/common.h @@ -65,3 +65,5 @@ #define DCESRV_PULL_HANDLE(h, inhandle, t) DCESRV_PULL_HANDLE_RETVAL(h, inhandle, t, NT_STATUS_INVALID_HANDLE) #define DCESRV_PULL_HANDLE_WERR(h, inhandle, t) DCESRV_PULL_HANDLE_RETVAL(h, inhandle, t, WERR_BADFID) + +#include "rpc_server/common/proto.h" diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk index 13b5a4d1f5..ced4701e09 100644 --- a/source4/rpc_server/config.mk +++ b/source4/rpc_server/config.mk @@ -3,6 +3,7 @@ ################################################ # Start SUBSYSTEM DCERPC_COMMON [SUBSYSTEM::DCERPC_COMMON] +PRIVATE_PROTO_HEADER = common/proto.h OBJ_FILES = \ common/server_info.o \ common/share_info.o diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 74f8dfe8d5..3e92ce0ef3 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -29,6 +29,7 @@ #include "lib/events/events.h" #include "smbd/service_stream.h" #include "system/filesys.h" +#include "libcli/security/proto.h" #include "build.h" /* diff --git a/source4/rpc_server/dcerpc_sock.c b/source4/rpc_server/dcerpc_sock.c index 540332299d..d696b75b20 100644 --- a/source4/rpc_server/dcerpc_sock.c +++ b/source4/rpc_server/dcerpc_sock.c @@ -28,6 +28,8 @@ #include "rpc_server/dcerpc_server.h" #include "smbd/service_stream.h" #include "lib/messaging/irpc.h" +#include "system/network.h" +#include "netif/netif.h" struct dcesrv_socket_context { const struct dcesrv_endpoint *endpoint; diff --git a/source4/rpc_server/dssetup/dcesrv_dssetup.c b/source4/rpc_server/dssetup/dcesrv_dssetup.c index 61e560299c..9bd8be3223 100644 --- a/source4/rpc_server/dssetup/dcesrv_dssetup.c +++ b/source4/rpc_server/dssetup/dcesrv_dssetup.c @@ -27,6 +27,7 @@ #include "rpc_server/common/common.h" #include "ldb/include/ldb.h" #include "dsdb/samdb/samdb.h" +#include "db_wrap.h" /* dssetup_DsRoleGetPrimaryDomainInformation */ diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index b62e1abaef..5af1dc3f40 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -27,7 +27,10 @@ #include "auth/auth.h" #include "dsdb/samdb/samdb.h" #include "libcli/ldap/ldap.h" +#include "libcli/security/proto.h" +#include "libcli/auth/proto.h" #include "ntvfs/ntvfs.h" +#include "db_wrap.h" /* this type allows us to distinguish handle types diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 1b13548c6b..7696888249 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -28,6 +28,8 @@ #include "auth/auth.h" #include "dsdb/samdb/samdb.h" #include "rpc_server/samr/proto.h" +#include "db_wrap.h" +#include "libcli/auth/proto.h" struct server_pipe_state { struct netr_Credential client_challenge; diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index e8828a912f..156cf931fe 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -32,7 +32,9 @@ #include "ads.h" #include "dsdb/samdb/samdb.h" #include "libcli/ldap/ldap.h" +#include "libcli/security/proto.h" #include "rpc_server/samr/proto.h" +#include "db_wrap.h" /* diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c index 998005cb0e..00d2f589ae 100644 --- a/source4/rpc_server/samr/samr_password.c +++ b/source4/rpc_server/samr/samr_password.c @@ -32,6 +32,8 @@ #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "rpc_server/samr/proto.h" +#include "libcli/auth/proto.h" +#include "db_wrap.h" /* samr_ChangePasswordUser -- cgit