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>

diff --git a/source4/rpc_server/common/reply.c b/source4/rpc_server/common/reply.c
index 68def745fd1ba53d936bda8d2a61a2c29e291fbb..68e0bd9e5189161f678b80a4a82bc888532ddec0 100644 (file)
--- 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 03cc27bc38ac6f0ddb8f6fdf35b1fe16cca9ed7f..ef767d8c2f596c80b1fde9b4960bf42d2dfe3e8c 100644 (file)
--- 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 c71e486843606a64337d5f0c8c32b82591eb30d0..7dc225d9c8c5304cd9e063102a82b42105aba1a4 100644 (file)
--- 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 c9b0f65d263797c36da25ac5c1e524fab4b9a1d4..47d04abd60e6767fe00c1eb7b2b90808736f94b2 100644 (file)
--- 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 15d0c3d6e09c4e0953d85d418201f8dbbfd7d6ed..f0947efc95b7ba5570c82fd55502e2988bc6cc8b 100644 (file)
--- 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