s4:rpc_server: Do not include s4 librpc headers in dcerpc core

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/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index e879cba82f8d9c8c81353b7a35602e46300daa8d..bfd0f669c3346ef639da360a9a6139616a151f81 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -26,7 +26,6 @@
 #include "lib/util/dlinklist.h"
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/dcerpc_server_proto.h"
-#include "librpc/rpc/dcerpc_proto.h"
 #include "system/filesys.h"
 #include "libcli/security/security.h"
 #include "param/param.h"

diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index 35ac3abe2ce78c5419adf8624096226aac1457b8..4fb5b3e76d161ecfd20eeac80ef63ee894d87360 100644 (file)
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -23,7 +23,7 @@
 #ifndef SAMBA_DCERPC_SERVER_H
 #define SAMBA_DCERPC_SERVER_H
 
-#include "librpc/rpc/dcerpc.h"
+#include "librpc/rpc/rpc_common.h"
 #include "librpc/ndr/libndr.h"
 
 /* modules can use the following to determine if the interface has changed

diff --git a/source4/rpc_server/dcesrv_reply.c b/source4/rpc_server/dcesrv_reply.c
index 33f2e51db907606fc07fe9ca7d1456d8b30e43d3..b1abd9d87abbb7e62d1c6c2b887390008bf6350a 100644 (file)
--- a/source4/rpc_server/dcesrv_reply.c
+++ b/source4/rpc_server/dcesrv_reply.c
@@ -25,7 +25,6 @@
 #include "lib/util/dlinklist.h"
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/dcerpc_server_proto.h"
-#include "librpc/rpc/dcerpc_proto.h"
 #include "param/param.h"
 #include "librpc/rpc/rpc_common.h"
 

diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index d34643a68db3714d4df817caf282dd6585268416..916e59e5f4b5275dd1c97c4d5d792a873a330dcd 100644 (file)
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -25,6 +25,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "auth/auth.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/ndr/ndr_table.h"
 #include "param/param.h"
 

diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 6cd7d417c19b23b14a98eeeb5fc58f28f7a83075..94d8b863bb023708d92a1328ec95739542df0aaa 100644 (file)
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -27,6 +27,7 @@
 #include "../lib/util/dlinklist.h"
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/dcerpc_server_proto.h"
+#include "librpc/rpc/dcerpc.h"
 #include "system/filesys.h"
 #include "lib/messaging/irpc.h"
 #include "system/network.h"