diff options
41 files changed, 46 insertions, 46 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index ca1a68248d..a6addcf91a 100644 --- 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) diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm index 1472b87db1..76b7b3d210 100644 --- 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", diff --git a/source4/configure.in b/source4/configure.in index 7672ed5eb2..5791a57adf 100644 --- 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) diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 70c9f62aec..ebc232a4c8 100644 --- 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" diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index dda79f50ad..5f9a60e114 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -33,15 +33,6 @@ ADD_OBJ_FILES = \ ############################## ############################## -# Start SUBSYSTEM LIBEVENTS -[SUBSYSTEM::LIBEVENTS] -NOPROTO = YES -INIT_OBJ_FILES = lib/events.o -REQUIRED_SUBSYSTEMS = LIBTALLOC -# End SUBSYSTEM LIBEVENTS -############################## - -############################## # Start SUBSYSTEM LIBBASIC [SUBSYSTEM::LIBBASIC] INIT_OBJ_FILES = lib/version.o diff --git a/source4/lib/events/config.m4 b/source4/lib/events/config.m4 new file mode 100644 index 0000000000..6e4095d5b8 --- /dev/null +++ b/source4/lib/events/config.m4 @@ -0,0 +1,2 @@ +AC_CHECK_HEADERS(sys/epoll.h) +AC_CHECK_FUNCS(epoll_create) diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk new file mode 100644 index 0000000000..c6f66b1c51 --- /dev/null +++ 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 +############################## diff --git a/source4/lib/events.c b/source4/lib/events/events.c index 4907a60f01..a852df68eb 100644 --- a/source4/lib/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) diff --git a/source4/include/events.h b/source4/lib/events/events.h index e3973c3c48..e3973c3c48 100644 --- a/source4/include/events.h +++ b/source4/lib/events/events.h diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 24205e5151..aab13ba8af 100644 --- 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" diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c index e08543a94b..2b8ddea897 100644 --- 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" diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c index be1b7547f1..94c0ced95d 100644 --- 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" diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c index 69de86088a..44c6a87e21 100644 --- 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" diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c index d614d80d99..079783435c 100644 --- 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); diff --git a/source4/libcli/raw/rawrequest.c b/source4/libcli/raw/rawrequest.c index 420ce0a3a2..b49009ac22 100644 --- 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 diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c index 4df8f27534..cbf0f4614e 100644 --- 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" diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c index e2e9462561..7e3f78edb4 100644 --- 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" diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index da87ca7386..420c7acf7c 100644 --- 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" diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c index 63371eefd2..e983c9f532 100644 --- 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 diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c index 4884398d78..1a8872b458 100644 --- 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" diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c index 6f308a0ba9..b11ebcc01e 100644 --- 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" diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index c64e4d3c84..0bb47bab2a 100644 --- 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" diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c index 7a8e6700c5..e9c4a2f754 100644 --- 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" diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 51902ecb87..63f8187f24 100644 --- 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" /* diff --git a/source4/rpc_server/dcerpc_sock.c b/source4/rpc_server/dcerpc_sock.c index 618f5af20f..62f8c91d11 100644 --- 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" diff --git a/source4/rpc_server/echo/rpc_echo.c b/source4/rpc_server/echo/rpc_echo.c index f78d1d231d..173e6fbf82 100644 --- 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) diff --git a/source4/smb_server/request.c b/source4/smb_server/request.c index c6847889f7..c690494d58 100644 --- 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" diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 3946e9ab13..10635f739d 100644 --- 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" diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c index f4e21e7e14..d3e5eeaa48 100644 --- 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" /* diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index 7d43855f6c..0a1e2a6103 100644 --- 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" diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index b7e9076e5d..37a67ee56c 100644 --- 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" diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index 223fb02085..988af86357 100644 --- 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" diff --git a/source4/smbd/server.c b/source4/smbd/server.c index bdc7d3212c..43d9364c9e 100644 --- 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" diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index 767f2052c3..35a6014eb2 100644 --- 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 */ diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c index d5349429d6..8f2255cf3e 100644 --- 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" /* diff --git a/source4/torture/local/messaging.c b/source4/torture/local/messaging.c index 204b6bf299..958fcaa8f0 100644 --- 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}; diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c index 942c7fbef4..a9141f4431 100644 --- 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" diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c index 49de23713e..9a0f924bfc 100644 --- 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" diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c index 7bf3a9dcc1..dd30df7c0b 100644 --- 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" diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index f1ed62c7d4..e3c2be038a 100644 --- 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" diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c index 54d01eda69..e39aed91d7 100644 --- 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" |