2025-01-10 01:18:15 +03:00 · 2005-02-03 11:56:03 +00:00 · 2005-02-03 11:56:03 +00:00 · 131dc76d56
commit 131dc76d56
parent dc35a0eb4f
41 changed files with 46 additions and 46 deletions
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@ -199,9 +199,6 @@ AC_CHECK_FUNCS(setbuffer)
 AC_CHECK_FUNCS(getdents)
 AC_CHECK_FUNCS(pread pwrite)

-AC_CHECK_HEADERS(sys/epoll.h)
-AC_CHECK_FUNCS(epoll_create)
-
 # needed for lib/charcnv.c
 AC_CHECK_FUNCS(setlocale)

--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@ -37,6 +37,7 @@ sub smb_build_main($)
 		"lib/tdb/config.mk",
 		"lib/registry/config.mk",
 		"lib/messaging/config.mk",
+		"lib/events/config.mk",
 		"smb_server/config.mk",
 		"rpc_server/config.mk",
 		"ldap_server/config.mk",
--- a/source4/configure.in
+++ b/source4/configure.in
@ -17,6 +17,7 @@ SMB_INCLUDE_M4(lib/socket/config.m4)
 SMB_INCLUDE_M4(lib/talloc/config.m4)
 SMB_INCLUDE_M4(lib/tdb/config.m4)
 SMB_INCLUDE_M4(lib/ldb/config.m4)
+SMB_INCLUDE_M4(lib/events/config.m4)
 SMB_INCLUDE_M4(lib/cmdline/config.m4)
 SMB_INCLUDE_M4(param/config.m4)
 SMB_INCLUDE_M4(libcli/auth/gensec.m4)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@ -20,7 +20,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "auth/auth.h"
 #include "dlinklist.h"
 #include "asn_1.h"
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@ -32,15 +32,6 @@ ADD_OBJ_FILES = \
 # End SUBSYSTEM LIBCRYPTO
 ##############################

-##############################
-# Start SUBSYSTEM LIBEVENTS
-[SUBSYSTEM::LIBEVENTS]
-NOPROTO = YES
-INIT_OBJ_FILES = lib/events.o
-REQUIRED_SUBSYSTEMS = LIBTALLOC
-# End SUBSYSTEM LIBEVENTS
-##############################
-
 ##############################
 # Start SUBSYSTEM LIBBASIC
 [SUBSYSTEM::LIBBASIC]
--- a/source4/lib/events/config.m4
+++ b/source4/lib/events/config.m4
@ -0,0 +1,2 @@
+AC_CHECK_HEADERS(sys/epoll.h)
+AC_CHECK_FUNCS(epoll_create)
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@ -0,0 +1,8 @@
+##############################
+# Start SUBSYSTEM LIBEVENTS
+[SUBSYSTEM::LIBEVENTS]
+NOPROTO = YES
+INIT_OBJ_FILES = lib/events/events.o
+REQUIRED_SUBSYSTEMS = LIBTALLOC
+# End SUBSYSTEM LIBEVENTS
+##############################
--- a/source4/lib/events/events.c
+++ b/source4/lib/events/events.c
@ -58,7 +58,7 @@
 #include "system/time.h"
 #include "system/select.h"
 #include "dlinklist.h"
-#include "events.h"
+#include "lib/events/events.h"

 /* use epoll if it is available */
 #if defined(HAVE_EPOLL_CREATE) && defined(HAVE_SYS_EPOLL_H)
--- a/source4/lib/events/events.h
+++ b/source4/lib/events/events.h
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "system/time.h"
 #include "messages.h"
 #include "dlinklist.h"
--- a/source4/libcli/composite/composite.c
+++ b/source4/libcli/composite/composite.c
@ -22,7 +22,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"

--- a/source4/libcli/nbt/nbtsocket.c
+++ b/source4/libcli/nbt/nbtsocket.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "dlinklist.h"
 #include "libcli/nbt/libnbt.h"

--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@ -22,7 +22,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"

--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@ -24,7 +24,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "dlinklist.h"
-#include "events.h"
+#include "lib/events/events.h"


 static void smbcli_transport_process_recv(struct smbcli_transport *transport);
--- a/source4/libcli/raw/rawrequest.c
+++ b/source4/libcli/raw/rawrequest.c
@ -26,7 +26,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "dlinklist.h"
-#include "events.h"
+#include "lib/events/events.h"

 /* we over allocate the data buffer to prevent too many realloc calls */
 #define REQ_OVER_ALLOCATION 0
--- a/source4/libcli/resolve/host.c
+++ b/source4/libcli/resolve/host.c
@ -30,7 +30,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "system/network.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"

--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@ -23,7 +23,7 @@

 #include "includes.h"
 #include "dlinklist.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"

--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@ -23,7 +23,7 @@

 #include "includes.h"
 #include "dlinklist.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"

 #define MIN_HDR_SIZE 16
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "smbd/service_task.h"
 #include "nbt_server/nbt_server.h"

--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "dlinklist.h"
 #include "nbt_server/nbt_server.h"
 #include "smbd/service_task.h"
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@ -26,7 +26,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "smb_server/smb_server.h"
--- a/source4/ntvfs/posix/pvfs_wait.c
+++ b/source4/ntvfs/posix/pvfs_wait.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "dlinklist.h"
 #include "vfs_posix.h"
 #include "smbd/service_stream.h"
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@ -27,7 +27,7 @@
 #include "auth/auth.h"
 #include "dlinklist.h"
 #include "rpc_server/dcerpc_server.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "smbd/service_stream.h"

 /*
--- a/source4/rpc_server/dcerpc_sock.c
+++ b/source4/rpc_server/dcerpc_sock.c
@ -23,7 +23,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "rpc_server/dcerpc_server.h"
 #include "smbd/service_stream.h"

--- a/source4/rpc_server/echo/rpc_echo.c
+++ b/source4/rpc_server/echo/rpc_echo.c
@ -24,7 +24,7 @@
 #include "includes.h"
 #include "rpc_server/dcerpc_server.h"
 #include "librpc/gen_ndr/ndr_echo.h"
-#include "events.h"
+#include "lib/events/events.h"


 static NTSTATUS echo_AddOne(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct echo_AddOne *r)
--- a/source4/smb_server/request.c
+++ b/source4/smb_server/request.c
@ -23,7 +23,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "system/time.h"
 #include "dlinklist.h"
 #include "smbd/service_stream.h"
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@ -20,7 +20,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "smb_server/smb_server.h"

 /*
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@ -23,7 +23,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"

--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@ -23,7 +23,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"

--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@ -29,7 +29,7 @@
 #include <execinfo.h>
 #endif
 #include "system/wait.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"

--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@ -24,7 +24,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "version.h"
 #include "dynconfig.h"
 #include "lib/cmdline/popt_common.h"
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@ -23,7 +23,7 @@

 #include "includes.h"
 #include "process_model.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "smbd/service_stream.h"

 /* the range of ports to try for dcerpc over tcp endpoints */
--- a/source4/smbd/service_task.c
+++ b/source4/smbd/service_task.c
@ -22,7 +22,7 @@

 #include "includes.h"
 #include "process_model.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "smbd/service_task.h"

 /*
--- a/source4/torture/local/messaging.c
+++ b/source4/torture/local/messaging.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"

 enum {MY_PING=1000, MY_PONG, MY_EXIT};

--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "libcli/nbt/libnbt.h"
 #include "librpc/gen_ndr/ndr_nbt.h"

--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"

--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@ -21,7 +21,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "librpc/gen_ndr/ndr_echo.h"


--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@ -23,7 +23,7 @@
 */

 #include "includes.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "auth/auth.h"

--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@ -22,7 +22,7 @@

 #include "includes.h"
 #include "dlinklist.h"
-#include "events.h"
+#include "lib/events/events.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"