From 6fcf8038e49ed7f0996ad21fb9f516de30131df7 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Thu, 3 Oct 2019 16:59:49 +0200 Subject: [PATCH] s4:rpc_server: Do not include s4 librpc headers in dcerpc core Signed-off-by: Samuel Cabrero Reviewed-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- source4/rpc_server/dcerpc_server.c | 1 - source4/rpc_server/dcerpc_server.h | 2 +- source4/rpc_server/dcesrv_reply.c | 1 - source4/rpc_server/remote/dcesrv_remote.c | 1 + source4/rpc_server/service_rpc.c | 1 + 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index e879cba82f8..bfd0f669c33 100644 --- 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 35ac3abe2ce..4fb5b3e76d1 100644 --- 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 33f2e51db90..b1abd9d87ab 100644 --- 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 d34643a68db..916e59e5f4b 100644 --- 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 6cd7d417c19..94d8b863bb0 100644 --- 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" -- 2.47.3