1From 44bccdf7d158ae93ba9a5515038aac2a5ac4fd85 Mon Sep 17 00:00:00 2001 2From: Bernd Kuhls <bernd.kuhls@t-online.de> 3Date: Sat, 27 Mar 2021 17:17:34 +0100 4Subject: [PATCH] dcesrv_core: fix build 5MIME-Version: 1.0 6Content-Type: text/plain; charset=UTF-8 7Content-Transfer-Encoding: 8bit 8 9Move include of system/network.h to avoid a build error: 10 11In file included from ../../lib/replace/system/network.h:35, 12 from ../../librpc/rpc/dcesrv_core.c:2658: 13usr/include/unistd.h: At top level: 14usr/include/unistd.h:675:16: error: conflicting types for ‘geteuid’ 15 675 | extern __uid_t geteuid (void) __THROW; 16 17Patch sent upstream: 18https://gitlab.com/samba-team/samba/-/merge_requests/1871 19 20Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 21--- 22 librpc/rpc/dcesrv_core.c | 11 +---------- 23 1 file changed, 1 insertion(+), 10 deletions(-) 24 25diff --git a/librpc/rpc/dcesrv_core.c b/librpc/rpc/dcesrv_core.c 26index 70e0245532e..e761329d157 100644 27--- a/librpc/rpc/dcesrv_core.c 28+++ b/librpc/rpc/dcesrv_core.c 29@@ -32,6 +32,7 @@ 30 #include "lib/tsocket/tsocket.h" 31 #include "librpc/gen_ndr/ndr_dcerpc.h" 32 #include "lib/util/tevent_ntstatus.h" 33+#include "system/network.h" 34 35 36 #undef DBGC_CLASS 37@@ -2633,16 +2634,6 @@ _PUBLIC_ void dcesrv_cleanup_broken_connections(struct dcesrv_context *dce_ctx) 38 } 39 } 40 41-/* We need this include to be able to compile on some plateforms 42- * (ie. freebsd 7.2) as it seems that <sys/uio.h> is not included 43- * correctly. 44- * It has to be that deep because otherwise we have a conflict on 45- * const struct dcesrv_interface declaration. 46- * This is mostly due to socket_wrapper defining #define bind swrap_bind 47- * which conflict with the bind used before. 48- */ 49-#include "system/network.h" 50- 51 struct dcesrv_sock_reply_state { 52 struct dcesrv_connection *dce_conn; 53 struct dcesrv_call_state *call; 54-- 552.29.2 56 57