r5197: moved events code to lib/events/ (suggestion from metze)

(This used to be commit 7f54c8a339f36aa43c9340be70ab7f0067593ef2)

diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index ca1a68248dbcff53e71480468491ea9c93abb2bd..a6addcf91af85ff405189f8a1f5413d8e6a1636c 100644 (file)
--- 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_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)
 
 # 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 1472b87db198825f9034407570fe8a5e3ac2da6e..76b7b3d21050fade62a9bf633a4970fae9ea7c5b 100644 (file)
--- 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/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",
                "smb_server/config.mk",
                "rpc_server/config.mk",
                "ldap_server/config.mk",

diff --git a/source4/configure.in b/source4/configure.in
index 7672ed5eb23c5fbc1d6ee4ac3db27ebe446caec0..5791a57adfc3cadb889db767be95420cadf58af9 100644 (file)
--- 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/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)
 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 70c9f62aec21cbade58a6404e298a91b1c786018..ebc232a4c83045b31050f0f502e0d5c67af409b1 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "auth/auth.h"
 #include "dlinklist.h"
 #include "asn_1.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 dda79f50ad87b415862419dd1bfd26a6995946d2..5f9a60e114d94a4121eac0f9ff52e2661d54679e 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -32,15 +32,6 @@ ADD_OBJ_FILES = \
 # End SUBSYSTEM LIBCRYPTO
 ##############################
 
 # 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]
 ##############################
 # Start SUBSYSTEM LIBBASIC
 [SUBSYSTEM::LIBBASIC]

diff --git a/source4/lib/events/config.m4 b/source4/lib/events/config.m4
new file mode 100644 (file)
index 0000000..6e4095d
--- /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 (file)
index 0000000..c6f66b1
--- /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
similarity index 99%
rename from source4/lib/events.c
rename to source4/lib/events/events.c
index 4907a60f01e0c6171647d7d9759d6f570099b2dc..a852df68eb468bdee9e14888efeea046499fb9c6 100644 (file)
--- 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 "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)
 
 /* 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
similarity index 100%
rename from source4/include/events.h
rename to source4/lib/events/events.h

diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 24205e5151035535c93fa9cb9086d8a13fce72ea..aab13ba8af932b25bb9778ba131b9351f999362a 100644 (file)
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "system/time.h"
 #include "messages.h"
 #include "dlinklist.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 e08543a94bf14e7f91ea14165c2087e55320c82c..2b8ddea897a6f9dd8738c5a1e0b2eea240a00bd8 100644 (file)
--- a/source4/libcli/composite/composite.c
+++ b/source4/libcli/composite/composite.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.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 be1b7547f1179f841b0663e751ebe7e9ad3312d9..94c0ced95d8d5b0095e1d20751f0c10150a6499f 100644 (file)
--- a/source4/libcli/nbt/nbtsocket.c
+++ b/source4/libcli/nbt/nbtsocket.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "dlinklist.h"
 #include "libcli/nbt/libnbt.h"
 
 #include "dlinklist.h"
 #include "libcli/nbt/libnbt.h"
 

diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index 69de86088ac10011c43a1654928b6f471823973f..44c6a87e2142d6561b27873e2716e9f1f49cefae 100644 (file)
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.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 d614d80d9924b9f6ee452cfcf2a5183fd04e935a..079783435c09d2c77d46fd159d31cf5267663a2a 100644 (file)
--- 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 "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);
 
 
 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 420ce0a3a20d7c4feef37886e35df673e3aafce5..b49009ac220fc1c61f984d0b40e370775439a324 100644 (file)
--- 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 "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
 
 /* 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 4df8f27534ae32fdf2624d5f0541d31066162946..cbf0f4614e591255e0fb807ede1c463cf9b9da45 100644 (file)
--- a/source4/libcli/resolve/host.c
+++ b/source4/libcli/resolve/host.c
@@ -30,7 +30,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 e2e94625619f378a7de0122b093525b63323bce3..7e3f78edb4a9211d01580a7dd96d58dce37baf9a 100644 (file)
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.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 da87ca73868c12d4e546da6a6329dcf92ffec7a0..420c7acf7c4db929358e5a765438770c6edf78fb 100644 (file)
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
 
 #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"
 
 #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 63371eefd2af60e6586e1f1171749a1f60cdfe7c..e983c9f532e51e7938100c2fe236ffab111d9077 100644 (file)
--- 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 "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
 #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 4884398d78d264d25b5c42c05db0704cd958d30f..1a8872b458c88baa1efd30d548523d8aa3c1ddf9 100644 (file)
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "smbd/service_task.h"
 #include "nbt_server/nbt_server.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 6f308a0ba938ea0595ef751bb46200cef4e79600..b11ebcc01ec24a2f3dc4a6a81528fc3ae5309cfc 100644 (file)
--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 c64e4d3c84a2141d3cf158ba25209396980975c9..0bb47bab2aa68ba2723d0852c0e22b688f000fa8 100644 (file)
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -26,7 +26,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 7a8e6700c51066f89e7f7669fab229fe8baa9967..e9c4a2f7541ed814ae9bbde55fae89baa9b54f38 100644 (file)
--- a/source4/ntvfs/posix/pvfs_wait.c
+++ b/source4/ntvfs/posix/pvfs_wait.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "dlinklist.h"
 #include "vfs_posix.h"
 #include "smbd/service_stream.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 51902ecb87c914342df9da279fd5029b524d5841..63f8187f24f74b0a2269a37c0e5b2f986c06b105 100644 (file)
--- 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 "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"
 
 /*
 #include "smbd/service_stream.h"
 
 /*

diff --git a/source4/rpc_server/dcerpc_sock.c b/source4/rpc_server/dcerpc_sock.c
index 618f5af20f178fa009a3939eb3c654d6e82c792e..62f8c91d11322b3dada265e80534c2bce41a0d43 100644 (file)
--- a/source4/rpc_server/dcerpc_sock.c
+++ b/source4/rpc_server/dcerpc_sock.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "rpc_server/dcerpc_server.h"
 #include "smbd/service_stream.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 f78d1d231d4fb670fa60d04b54ef78d1f11657f3..173e6fbf822fffe73d2712ce12e4761abc2b6e53 100644 (file)
--- 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 "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)
 
 
 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 c6847889f7caf1e0569a13d80dc2f4d49db6352a..c690494d5883621c5a8a81035fc23b14dd94a8c5 100644 (file)
--- a/source4/smb_server/request.c
+++ b/source4/smb_server/request.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 #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 3946e9ab137c2c22af85bcdd45833adbe00d2af3..10635f739df1e9abd5e7dbcc9f21f9802d5238ab 100644 (file)
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "system/time.h"
 #include "dlinklist.h"
 #include "smbd/service_stream.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 f4e21e7e1456c6d2df80507841633c64c15f8f9f..d3e5eeaa48b78303b09d24e283fc1db765d91e45 100644 (file)
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "smb_server/smb_server.h"
 
 /*
 #include "smb_server/smb_server.h"
 
 /*

diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c
index 7d43855f6c18915ed664b2eef6e9db489b8e2918..0a1e2a61031387ae133ee6e56ea225d6fe5e79fc 100644 (file)
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "dlinklist.h"
 #include "smb_server/smb_server.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 b7e9076e5d07ad1136ebb3691fe7388541c50355..37a67ee56c4fefc628e505db5a246c06cef284ba 100644 (file)
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "dlinklist.h"
 #include "smb_server/smb_server.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 223fb020850a7fbf4b6a16be6e3c1d42f69056f7..988af86357d49796ad76ffe565ec4f4a5a1fda6c 100644 (file)
--- 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 <execinfo.h>
 #endif
 #include "system/wait.h"

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

 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
 
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
 

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index bdc7d3212cbe11e1175ab643678df5b204be85ac..43d9364c9e3e4c7a19bce1e69cbc50defb696cc6 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -24,7 +24,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "version.h"
 #include "dynconfig.h"
 #include "lib/cmdline/popt_common.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 767f2052c3f1295ab65805cfa1408ad90f652a5c..35a6014eb27c1a9690f6d1dbf1c3de1217c58f97 100644 (file)
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "process_model.h"
 
 #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 */
 #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 d5349429d6ad5c0f0aa103ceb0d947ab7480f4bc..8f2255cf3ee38c3c8d7c82892aa6b6766dbd223a 100644 (file)
--- a/source4/smbd/service_task.c
+++ b/source4/smbd/service_task.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "process_model.h"
 
 #include "includes.h"
 #include "process_model.h"

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

 #include "smbd/service_task.h"
 
 /*
 #include "smbd/service_task.h"
 
 /*

diff --git a/source4/torture/local/messaging.c b/source4/torture/local/messaging.c
index 204b6bf2991e064798bbc960f1f47fac5ae1db4a..958fcaa8f082b69d951c0b059ab5ee7e362ad93e 100644 (file)
--- a/source4/torture/local/messaging.c
+++ b/source4/torture/local/messaging.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 
 enum {MY_PING=1000, MY_PONG, MY_EXIT};
 
 
 enum {MY_PING=1000, MY_PONG, MY_EXIT};
 

diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index 942c7fbef4d4730a7e09c78570c371c29f3ef065..a9141f443145702f8c8b58aba28bf8757fc17145 100644 (file)
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "libcli/nbt/libnbt.h"
 #include "librpc/gen_ndr/ndr_nbt.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 49de23713e91515d0b1528b63aaec13a9fb3b166..9a0f924bfc039d1cab15dcfbeb5fc26732abbd41 100644 (file)
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.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 7bf3a9dcc1078150d16e6e1023f7abc6cd5c6f7f..dd30df7c0b53514cc3d865c89df5dc4ff2f55a82 100644 (file)
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "librpc/gen_ndr/ndr_echo.h"
 
 
 #include "librpc/gen_ndr/ndr_echo.h"
 
 

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index f1ed62c7d4e7cbe618b32a4a36e2e4e61cea4d69..e3c2be038a8ef78a06b8104c38078c0107b252f4 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

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

 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "auth/auth.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 54d01eda69481f2ed450f6bfa7939334539a9634..e39aed91d72a4105921561b3d9acd1c09db49d25 100644 (file)
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
 
 #include "includes.h"
 #include "dlinklist.h"

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

 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
 
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"