summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorSamuel Cabrero <scabrero@samba.org>2019-09-30 23:35:55 +0200
committerAndreas Schneider <asn@cryptomilk.org>2019-10-18 16:07:36 +0000
commit4d7a916189c8d910c22eb46c9fe0f061d83cab59 (patch)
treeb1df3db6e849a126113e70e89f3fb9127b4eecb3 /source4
parentd572219e1bfcd9342f0841b4faa446fd41bbb42d (diff)
downloadsamba-4d7a916189c8d910c22eb46c9fe0f061d83cab59.tar.gz
s4:rpc_server: Cleanup includes
Signed-off-by: Samuel Cabrero <scabrero@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/rpc_server/common/reply.c14
-rw-r--r--source4/rpc_server/dcerpc_server.c11
-rw-r--r--source4/rpc_server/dcesrv_auth.c2
-rw-r--r--source4/rpc_server/drsuapi/getncchanges.c1
-rw-r--r--source4/rpc_server/handles.c4
5 files changed, 8 insertions, 24 deletions
diff --git a/source4/rpc_server/common/reply.c b/source4/rpc_server/common/reply.c
index 68def745fd1..68e0bd9e518 100644
--- a/source4/rpc_server/common/reply.c
+++ b/source4/rpc_server/common/reply.c
@@ -21,26 +21,14 @@
*/
#include "includes.h"
-#include "auth/auth.h"
#include "auth/gensec/gensec.h"
-#include "../lib/util/dlinklist.h"
+#include "lib/util/dlinklist.h"
#include "rpc_server/dcerpc_server.h"
#include "rpc_server/dcerpc_server_proto.h"
-#include "rpc_server/common/proto.h"
#include "librpc/rpc/dcerpc_proto.h"
-#include "system/filesys.h"
-#include "libcli/security/security.h"
#include "param/param.h"
-#include "../lib/tsocket/tsocket.h"
-#include "../libcli/named_pipe_auth/npa_tstream.h"
-#include "smbd/service_stream.h"
-#include "../lib/tsocket/tsocket.h"
-#include "lib/socket/socket.h"
-#include "smbd/process_model.h"
-#include "lib/messaging/irpc.h"
#include "librpc/rpc/rpc_common.h"
-
/*
move a call from an existing linked list to the specified list. This
prevents bugs where we forget to remove the call from a previous
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 03cc27bc38a..ef767d8c2f5 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -23,25 +23,24 @@
#include "includes.h"
#include "auth/auth.h"
#include "auth/gensec/gensec.h"
-#include "../lib/util/dlinklist.h"
+#include "lib/util/dlinklist.h"
#include "rpc_server/dcerpc_server.h"
#include "rpc_server/dcerpc_server_proto.h"
-#include "rpc_server/common/proto.h"
#include "librpc/rpc/dcerpc_proto.h"
#include "system/filesys.h"
#include "libcli/security/security.h"
#include "param/param.h"
-#include "../lib/tsocket/tsocket.h"
-#include "../libcli/named_pipe_auth/npa_tstream.h"
+#include "lib/tsocket/tsocket.h"
+#include "libcli/named_pipe_auth/npa_tstream.h"
#include "smbd/service_stream.h"
-#include "../lib/tsocket/tsocket.h"
+#include "lib/tsocket/tsocket.h"
#include "lib/socket/socket.h"
#include "smbd/process_model.h"
#include "lib/messaging/irpc.h"
#include "librpc/rpc/rpc_common.h"
#include "lib/util/samba_modules.h"
#include "librpc/gen_ndr/ndr_dcerpc.h"
-#include "../lib/util/tevent_ntstatus.h"
+#include "lib/util/tevent_ntstatus.h"
static NTSTATUS dcesrv_negotiate_contexts(struct dcesrv_call_state *call,
const struct dcerpc_bind *b,
diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c
index c71e4868436..7dc225d9c8c 100644
--- a/source4/rpc_server/dcesrv_auth.c
+++ b/source4/rpc_server/dcesrv_auth.c
@@ -23,8 +23,6 @@
#include "includes.h"
#include "rpc_server/dcerpc_server.h"
#include "rpc_server/dcerpc_server_proto.h"
-#include "rpc_server/common/proto.h"
-#include "librpc/rpc/dcerpc_proto.h"
#include "librpc/gen_ndr/ndr_dcerpc.h"
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index c9b0f65d263..47d04abd60e 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -31,7 +31,6 @@
#include "libcli/security/security.h"
#include "libcli/security/session.h"
#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
-#include "rpc_server/dcerpc_server_proto.h"
#include "rpc_server/common/sid_helper.h"
#include "../libcli/drsuapi/drsuapi.h"
#include "lib/util/binsearch.h"
diff --git a/source4/rpc_server/handles.c b/source4/rpc_server/handles.c
index 15d0c3d6e09..f0947efc95b 100644
--- a/source4/rpc_server/handles.c
+++ b/source4/rpc_server/handles.c
@@ -20,10 +20,10 @@
*/
#include "includes.h"
-#include "../lib/util/dlinklist.h"
+#include "lib/util/dlinklist.h"
#include "rpc_server/dcerpc_server.h"
#include "libcli/security/security.h"
-#include "auth/session.h"
+#include "librpc/gen_ndr/auth.h"
/*
destroy a rpc handle