[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Tue Feb 19 17:34:03 MST 2013
The branch, master has been updated
via 85b6329 s3:selftest: generate ${SELFTESTPREFIX}/subunit with the raw output
via f3aa372 s3:torture: call fault_setup() to get usage backtraces
via e29830a s3:include: avoid TEVENT_COMPAT_DEFINES
via 95eeb9f s3:lib: s/event_add_timed/tevent_add_timer
via 01b8b1b s3:nmbd: s/event_add_timed/tevent_add_timer
via cf1336e s3:modules: s/event_add_timed/tevent_add_timer
via 98660d5 s3:rpc_server: s/event_add_timed/tevent_add_timer
via fdf9da9 s3:winbindd: s/event_add_timed/tevent_add_timer
via cdb97fd s3:lib: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_
via abf8e16 s3:printing: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_
via e5f6250 s3:smbd: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_
via 64145e7 s3:modules: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_
via c085803 s3:lib: s/struct fd_event/struct tevent_fd
via 9ececaa s3:modules: s/struct fd_event/struct tevent_fd
via b7a925f s3:printing: s/struct fd_event/struct tevent_fd
via a0d96b5 s3:smbd: s/struct fd_event/struct tevent_fd
via 59b8f80 s3:lib: s/struct timed_event/struct tevent_timer
via 39660e6 s3:nmbd: s/struct timed_event/struct tevent_timer
via 80421ee s3:modules: s/struct timed_event/struct tevent_timer
via 7f41a62 s3:rpc_server: s/struct timed_event/struct tevent_timer
via 2672c37 s3:smbd: s/EVENT_FD/TEVENT_FD
via ae1cb5c s3:smbd: s/struct timed_event/struct tevent_timer
via 3ae2ed4 s3:winbindd: s/struct timed_event/struct tevent_timer
via 804b18f s3:lib/events: s/EVENT_FD/TEVENT_FD
via 935a40f s3:lib: s/struct event_context/struct tevent_context
via d0bca41 s3:libsmb: s/struct event_context/struct tevent_context
via 00b1ef8 s3:modules: s/struct event_context/struct tevent_context
via 5743277 s3:nmbd: s/struct event_context/struct tevent_context
via 99367d4 s3:printing: s/struct event_context/struct tevent_context
via cf1f993 s3:rpc_server: s/struct event_context/struct tevent_context
via f9d0473 s3:rpc_client: s/struct event_context/struct tevent_context
via 415e8e0 s3:smbd: s/struct event_context/struct tevent_context
via 5c72385 s3:torture: s/struct event_context/struct tevent_context
via b946b45 s3:winbindd: s/struct event_context/struct tevent_context
via 36f4547 s3:includes: remove event_context_init() define for s3_tevent_context_init()
via 5a2aaaf s3:winbindd: make use of samba_tevent_context_init()
via b538c31 s3:rpc_client: make use of samba_tevent_context_init()
via 60fa4c7 s3:torture: make use of samba_tevent_context_init()
via 22dd9e7 s3:utils: make use of samba_tevent_context_init()
via e8bda00 s3:libnet: make use of samba_tevent_context_init()
via f3915cf s3:lib: make use of samba_tevent_context_init()
via 3cad605 s3:libads: make use of samba_tevent_context_init()
via c8dda78 s3:libsmb: make use of samba_tevent_context_init()
via 7fb72050 s4:lib/com: make use of samba_tevent_context_init()
via 5d2574e s4:auth/kerberos: make use of samba_tevent_context_init()
via 3d5bb24 librpc/rpc: make use of samba_tevent_context_init()
via 4ea37dd libcli/smb: make use of samba_tevent_context_init()
via f40c93a libcli/cldap: make use of samba_tevent_context_init()
via f7aa601 lib/util: add samba_tevent_context_init()
from ff8ba06 build/autoconf: fix check for GNU ld version
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 85b6329b91f402da474547410e82438ea2554775
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Feb 15 14:29:51 2013 +0100
s3:selftest: generate ${SELFTESTPREFIX}/subunit with the raw output
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Wed Feb 20 01:33:50 CET 2013 on sn-devel-104
commit f3aa372bcb51bc08724f4ebe211b8c499f22cf30
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Feb 15 14:23:50 2013 +0100
s3:torture: call fault_setup() to get usage backtraces
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit e29830a60fe7df82ba5f87e6f4e6359e025134d8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 11:04:18 2013 +0100
s3:include: avoid TEVENT_COMPAT_DEFINES
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 95eeb9f08be84f92799ce0916a5dfa2dafd4b5f6
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:57:54 2013 +0100
s3:lib: s/event_add_timed/tevent_add_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 01b8b1b88789a1f309a06d8db2983fd540feef9b
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:57:54 2013 +0100
s3:nmbd: s/event_add_timed/tevent_add_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit cf1336e356001c3a83de063c501264fe37bf38c6
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:57:54 2013 +0100
s3:modules: s/event_add_timed/tevent_add_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 98660d54a86fc29ee34094aa486b12ddf27e3906
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:57:54 2013 +0100
s3:rpc_server: s/event_add_timed/tevent_add_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit fdf9da96c5ebe3fde8ec9fe6fba70cc8427f51d0
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:57:54 2013 +0100
s3:winbindd: s/event_add_timed/tevent_add_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit cdb97fd9ec107617083c8d9ea068e1c0555443e8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:53:02 2013 +0100
s3:lib: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit abf8e166b8a23b256fada0f317cf552cc4f53ec1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:53:02 2013 +0100
s3:printing: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit e5f6250ae26ba103b1682ae933b61732247795e8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:53:02 2013 +0100
s3:smbd: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 64145e7958204f2b2c444e8e904b533dd2108290
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:53:02 2013 +0100
s3:modules: s/event_add_fd/tevent_add_fd and s/EVENT_FD_/TEVENT_FD_
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit c0858030ba25d23b06a9dcf90b303f9325b7ac3e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:24:12 2013 +0100
s3:lib: s/struct fd_event/struct tevent_fd
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 9ececaae5c13216ce9e29eebb0fad0d7a0e2ab90
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:24:12 2013 +0100
s3:modules: s/struct fd_event/struct tevent_fd
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit b7a925f56bb03aa80b043bb355203670edd75628
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:24:12 2013 +0100
s3:printing: s/struct fd_event/struct tevent_fd
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit a0d96b53e7730c5e0b4986342fa73ab81b7869ef
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:24:12 2013 +0100
s3:smbd: s/struct fd_event/struct tevent_fd
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 59b8f803d74c45e2477c533b5b380afb011f8ebe
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:18:29 2013 +0100
s3:lib: s/struct timed_event/struct tevent_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 39660e6d88b54aee668e3f78bba83f036f1ff95c
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:18:29 2013 +0100
s3:nmbd: s/struct timed_event/struct tevent_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 80421ee9752ed06e12721ef2a28b08e1c311e31e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:18:29 2013 +0100
s3:modules: s/struct timed_event/struct tevent_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 7f41a62e75ab9a07e93c4de2597a7ff9c47f506d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:18:29 2013 +0100
s3:rpc_server: s/struct timed_event/struct tevent_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 2672c37a8fbc9ff4e5b74e9a5ae55a3e08beed43
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:18:57 2013 +0100
s3:smbd: s/EVENT_FD/TEVENT_FD
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit ae1cb5ca04eb46d1112868bc80b459eb2a168920
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:18:29 2013 +0100
s3:smbd: s/struct timed_event/struct tevent_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 3ae2ed4504c81e197fab5804e9cde7ebeb34d5c2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:17:40 2013 +0100
s3:winbindd: s/struct timed_event/struct tevent_timer
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 804b18f38eabf07f2f01d44ea534fa9805443213
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:16:48 2013 +0100
s3:lib/events: s/EVENT_FD/TEVENT_FD
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 935a40f4f20048204fb7baf2f208e7e44f2485e7
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 10:00:26 2013 +0100
s3:lib: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit d0bca41f481fbaa4b25190bbb58fe119ca5ccec9
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:59:58 2013 +0100
s3:libsmb: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 00b1ef8853a0ad3bf967f98d5a9a570109abb82e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:59:08 2013 +0100
s3:modules: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 5743277ed6297ce77afcdb7b336c8929c83af8a3
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:58:40 2013 +0100
s3:nmbd: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 99367d413ac00d631fe0e559473395feee6cfc5a
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:58:10 2013 +0100
s3:printing: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit cf1f993c057cf296edfd5c28b2f9cd84862340d0
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:57:48 2013 +0100
s3:rpc_server: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit f9d0473d024bc7b6efc4619c7c77b5bf992f6d54
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:57:22 2013 +0100
s3:rpc_client: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 415e8e0513017207c9c87ec968f22ed43bdb220b
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:56:41 2013 +0100
s3:smbd: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 5c72385f3d4ba5f5747d9d5895286dfacbb2ba7a
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:55:58 2013 +0100
s3:torture: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit b946b457991b34e89292a4dcd54f34a5c1de52d6
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:55:02 2013 +0100
s3:winbindd: s/struct event_context/struct tevent_context
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 36f4547401a67acf19d2fc1037beb6d89ae86b84
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:21:53 2013 +0100
s3:includes: remove event_context_init() define for s3_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 5a2aaafee7f040baaec24467f09a4a8b7e95c1d7
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:12:26 2013 +0100
s3:winbindd: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit b538c3188971621dd55011e6050b5af281403bf7
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:17:45 2013 +0100
s3:rpc_client: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 60fa4c7305b4c766fe05a06025bce9ab1ff02902
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:11:19 2013 +0100
s3:torture: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 22dd9e7c792c4decf4fcbe3b1ed2ea1f165c2af6
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:11:52 2013 +0100
s3:utils: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit e8bda0017c5f8770dc3dce238ea3cefb1f4dd73f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:17:22 2013 +0100
s3:libnet: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit f3915cf0ec9ac51f541cafcb367221a3dac3aec8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:10:34 2013 +0100
s3:lib: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 3cad605ee9454ae6000349340073124a8df80896
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:09:57 2013 +0100
s3:libads: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit c8dda78e35294ad56f088c86201430442df2efce
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:08:19 2013 +0100
s3:libsmb: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 7fb720502f6488b5b4e29a00f4b34a6486159349
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:13:23 2013 +0100
s4:lib/com: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 5d2574edd24464c0b38c6f2e80382b01a82e00d0
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:12:58 2013 +0100
s4:auth/kerberos: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 3d5bb24a7b6e772ebc15e1d6063d9a8fd97d9ce7
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:09:31 2013 +0100
librpc/rpc: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 4ea37dd52105c7faff633d172f96972bd79305f5
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:07:11 2013 +0100
libcli/smb: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit f40c93afcbda48ebe109896fb115377a276b4457
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 09:06:29 2013 +0100
libcli/cldap: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit f7aa60175ad7a3517db32f45f06dfbf6486dff69
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 18 08:54:51 2013 +0100
lib/util: add samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/util/samba_util.h | 6 +
.../events/tevent_s4.c => lib/util/tevent_debug.c | 46 ++---
lib/util/wscript_build | 5 +-
libcli/cldap/cldap.c | 4 +-
libcli/smb/smb1cli_echo.c | 2 +-
libcli/smb/smb1cli_trans.c | 2 +-
libcli/smb/smb2cli_close.c | 2 +-
libcli/smb/smb2cli_create.c | 2 +-
libcli/smb/smb2cli_echo.c | 2 +-
libcli/smb/smb2cli_flush.c | 2 +-
libcli/smb/smb2cli_ioctl.c | 2 +-
libcli/smb/smb2cli_query_directory.c | 2 +-
libcli/smb/smb2cli_query_info.c | 2 +-
libcli/smb/smb2cli_read.c | 2 +-
libcli/smb/smb2cli_session.c | 2 +-
libcli/smb/smb2cli_set_info.c | 2 +-
libcli/smb/smb2cli_write.c | 2 +-
libcli/smb/smbXcli_base.c | 4 +-
librpc/rpc/binding_handle.c | 4 +-
source3/Makefile.in | 2 +-
source3/include/event.h | 10 +-
source3/include/messages.h | 4 +-
source3/include/proto.h | 6 +-
source3/include/smb.h | 2 +-
source3/include/smbldap.h | 2 +-
source3/include/vfs.h | 4 +-
source3/lib/ctdbd_conn.c | 18 +-
source3/lib/events.c | 12 +-
source3/lib/fncall.c | 2 +-
source3/lib/g_lock.c | 4 +-
source3/lib/messages.c | 2 +-
source3/lib/messages_ctdbd.c | 6 +-
source3/lib/msg_channel.c | 2 +-
source3/lib/smbldap.c | 4 +-
source3/lib/tldap.c | 10 +-
source3/lib/tldap_util.c | 2 +-
source3/lib/util.c | 2 +-
source3/lib/util_sock.c | 12 +-
source3/libads/cldap.c | 2 +-
source3/libnet/libnet_samsync.c | 2 +-
source3/libsmb/cliconnect.c | 36 ++--
source3/libsmb/clidgram.c | 2 +-
source3/libsmb/clientgen.c | 8 +-
source3/libsmb/clifile.c | 246 ++++++++++----------
source3/libsmb/clifsinfo.c | 8 +-
source3/libsmb/clilist.c | 12 +-
source3/libsmb/climessage.c | 4 +-
source3/libsmb/clioplock.c | 2 +-
source3/libsmb/clirap.c | 22 +-
source3/libsmb/clirap.h | 8 +-
source3/libsmb/clireadwrite.c | 34 ++--
source3/libsmb/clisymlink.c | 8 +-
source3/libsmb/namequery.c | 10 +-
source3/libsmb/proto.h | 96 ++++----
source3/libsmb/smb2cli_tcon.c | 4 +-
source3/libsmb/smbsock_connect.c | 4 +-
source3/modules/vfs_aio_fork.c | 10 +-
source3/modules/vfs_aio_linux.c | 10 +-
source3/modules/vfs_aio_pthread.c | 14 +-
source3/modules/vfs_notify_fam.c | 16 +-
source3/modules/vfs_preopen.c | 12 +-
source3/nmbd/nmbd.c | 2 +-
source3/nmbd/nmbd_processlogon.c | 6 +-
source3/nmbd/nmbd_proto.h | 2 +-
source3/printing/print_cups.c | 14 +-
source3/printing/queue_process.c | 2 +-
source3/rpc_client/cli_pipe.c | 32 ++--
source3/rpc_client/cli_pipe.h | 4 +-
source3/rpc_client/rpc_transport.h | 8 +-
source3/rpc_client/rpc_transport_np.c | 6 +-
source3/rpc_client/rpc_transport_tstream.c | 6 +-
source3/rpc_server/samr/srv_samr_nt.c | 8 +-
source3/rpc_server/srv_pipe_hnd.c | 6 +-
source3/rpc_server/srv_pipe_hnd.h | 4 +-
source3/selftest/s3-selftest.sh | 2 +-
source3/smbd/blocking.c | 4 +-
source3/smbd/fileio.c | 4 +-
source3/smbd/globals.h | 8 +-
source3/smbd/notify.c | 2 +-
source3/smbd/notify_inotify.c | 4 +-
source3/smbd/notify_internal.c | 2 +-
source3/smbd/oplock.c | 4 +-
source3/smbd/oplock_irix.c | 10 +-
source3/smbd/process.c | 28 ++--
source3/smbd/proto.h | 12 +-
source3/smbd/server.c | 8 +-
source3/smbd/smb2_create.c | 6 +-
source3/torture/msgtest.c | 2 +-
source3/torture/nbench.c | 2 +-
source3/torture/test_addrchange.c | 2 +-
source3/torture/test_async_echo.c | 2 +-
source3/torture/test_chain3.c | 2 +-
source3/torture/test_ctdbconn.c | 2 +-
source3/torture/test_dbwrap_watch.c | 2 +-
source3/torture/test_msg.c | 2 +-
source3/torture/test_notify.c | 4 +-
source3/torture/test_notify_online.c | 4 +-
source3/torture/test_smb2.c | 12 +-
source3/torture/torture.c | 21 +-
source3/torture/vfstest.c | 2 +-
source3/utils/dbwrap_tool.c | 2 +-
source3/utils/dbwrap_torture.c | 2 +-
source3/utils/net.c | 2 +-
source3/utils/net_g_lock.c | 2 +-
source3/utils/smbcontrol.c | 2 +-
source3/utils/status.c | 2 +-
source3/winbindd/winbindd.c | 2 +-
source3/winbindd/winbindd.h | 8 +-
source3/winbindd/winbindd_cm.c | 8 +-
source3/winbindd/winbindd_cred_cache.c | 28 ++--
source3/winbindd/winbindd_dual.c | 16 +-
source4/auth/kerberos/krb5_init_context.c | 2 +-
source4/lib/com/main.c | 2 +-
113 files changed, 549 insertions(+), 553 deletions(-)
copy source4/lib/events/tevent_s4.c => lib/util/tevent_debug.c (57%)
Changeset truncated at 500 lines:
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index 27c2e6e..f59dc70 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -960,4 +960,10 @@ void server_id_set_disconnected(struct server_id *id);
*/
bool server_id_is_disconnected(const struct server_id *id);
+/*
+ * Samba code should use samba_tevent_context_init() instead of
+ * tevent_context_init() in order to get the debug output.
+ */
+struct tevent_context *samba_tevent_context_init(TALLOC_CTX *mem_ctx);
+
#endif /* _SAMBA_UTIL_H_ */
diff --git a/source4/lib/events/tevent_s4.c b/lib/util/tevent_debug.c
similarity index 57%
copy from source4/lib/events/tevent_s4.c
copy to lib/util/tevent_debug.c
index 6770dd0..3a5a313 100644
--- a/source4/lib/events/tevent_s4.c
+++ b/lib/util/tevent_debug.c
@@ -1,33 +1,33 @@
-/*
+/*
Unix SMB/CIFS implementation.
Copyright (C) Andrew Tridgell 2003
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-#define TEVENT_DEPRECATED 1
-#include "lib/events/events.h"
+#include <tevent.h>
-/*
- this is used to catch debug messages from events
-*/
-static void ev_wrap_debug(void *context, enum tevent_debug_level level,
- const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0);
+static void samba_tevent_debug(void *context,
+ enum tevent_debug_level level,
+ const char *fmt,
+ va_list ap) PRINTF_ATTRIBUTE(3,0);
-static void ev_wrap_debug(void *context, enum tevent_debug_level level,
- const char *fmt, va_list ap)
+static void samba_tevent_debug(void *context,
+ enum tevent_debug_level level,
+ const char *fmt,
+ va_list ap)
{
int samba_level = -1;
char *s = NULL;
@@ -44,32 +44,24 @@ static void ev_wrap_debug(void *context, enum tevent_debug_level level,
case TEVENT_DEBUG_TRACE:
samba_level = 50;
break;
-
};
+
if (CHECK_DEBUGLVL(samba_level)) {
vasprintf(&s, fmt, ap);
if (!s) return;
- DEBUG(samba_level, ("tevent: %s", s));
+ DEBUG(samba_level, ("samba_tevent: %s", s));
free(s);
}
}
-/*
- create a event_context structure. This must be the first events
- call, and all subsequent calls pass this event_context as the first
- element. Event handlers also receive this as their first argument.
-
- This samba4 specific call sets the samba4 debug handler.
-*/
-struct tevent_context *s4_event_context_init(TALLOC_CTX *mem_ctx)
+struct tevent_context *samba_tevent_context_init(TALLOC_CTX *mem_ctx)
{
struct tevent_context *ev;
- ev = tevent_context_init_byname(mem_ctx, NULL);
+ ev = tevent_context_init(mem_ctx);
if (ev) {
- tevent_set_debug(ev, ev_wrap_debug, NULL);
- tevent_loop_allow_nesting(ev);
+ tevent_set_debug(ev, samba_tevent_debug, NULL);
}
+
return ev;
}
-
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index a671bc9..ac270ee 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -7,9 +7,10 @@ bld.SAMBA_LIBRARY('samba-util',
signal.c system.c params.c util.c util_id.c util_net.c
util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c
util_str.c util_str_common.c substitute.c ms_fnmatch.c
- server_id.c dprintf.c parmlist.c bitmap.c pidfile.c''',
+ server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
+ tevent_debug.c''',
deps='DYNCONFIG',
- public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset util_setid',
+ public_deps='talloc tevent execinfo uid_wrapper pthread LIBCRYPTO charset util_setid',
public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
local_include=False,
diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c
index 3322bd8..24ce39f 100644
--- a/libcli/cldap/cldap.c
+++ b/libcli/cldap/cldap.c
@@ -850,7 +850,7 @@ NTSTATUS cldap_search(struct cldap_socket *cldap,
frame = talloc_stackframe();
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY;
@@ -1074,7 +1074,7 @@ NTSTATUS cldap_netlogon(struct cldap_socket *cldap,
frame = talloc_stackframe();
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY;
diff --git a/libcli/smb/smb1cli_echo.c b/libcli/smb/smb1cli_echo.c
index cab8ae6..4fb7c60 100644
--- a/libcli/smb/smb1cli_echo.c
+++ b/libcli/smb/smb1cli_echo.c
@@ -152,7 +152,7 @@ NTSTATUS smb1cli_echo(struct smbXcli_conn *conn, uint32_t timeout_msec,
status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb1cli_trans.c b/libcli/smb/smb1cli_trans.c
index cc4f7d3..38d4e2e 100644
--- a/libcli/smb/smb1cli_trans.c
+++ b/libcli/smb/smb1cli_trans.c
@@ -874,7 +874,7 @@ NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn,
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
status = NT_STATUS_NO_MEMORY;
goto fail;
diff --git a/libcli/smb/smb2cli_close.c b/libcli/smb/smb2cli_close.c
index c10a21f..ed15a20 100644
--- a/libcli/smb/smb2cli_close.c
+++ b/libcli/smb/smb2cli_close.c
@@ -115,7 +115,7 @@ NTSTATUS smb2cli_close(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb2cli_create.c b/libcli/smb/smb2cli_create.c
index 62efc48..627bdcb 100644
--- a/libcli/smb/smb2cli_create.c
+++ b/libcli/smb/smb2cli_create.c
@@ -256,7 +256,7 @@ NTSTATUS smb2cli_create(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb2cli_echo.c b/libcli/smb/smb2cli_echo.c
index b978d50..29cbf26 100644
--- a/libcli/smb/smb2cli_echo.c
+++ b/libcli/smb/smb2cli_echo.c
@@ -103,7 +103,7 @@ NTSTATUS smb2cli_echo(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb2cli_flush.c b/libcli/smb/smb2cli_flush.c
index 4b14347..0ca2699 100644
--- a/libcli/smb/smb2cli_flush.c
+++ b/libcli/smb/smb2cli_flush.c
@@ -112,7 +112,7 @@ NTSTATUS smb2cli_flush(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb2cli_ioctl.c b/libcli/smb/smb2cli_ioctl.c
index ced9ee6..15a990c 100644
--- a/libcli/smb/smb2cli_ioctl.c
+++ b/libcli/smb/smb2cli_ioctl.c
@@ -306,7 +306,7 @@ NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER_MIX;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb2cli_query_directory.c b/libcli/smb/smb2cli_query_directory.c
index 49d5365..32f5bee 100644
--- a/libcli/smb/smb2cli_query_directory.c
+++ b/libcli/smb/smb2cli_query_directory.c
@@ -186,7 +186,7 @@ NTSTATUS smb2cli_query_directory(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb2cli_query_info.c b/libcli/smb/smb2cli_query_info.c
index 96847fc..9ec16b5 100644
--- a/libcli/smb/smb2cli_query_info.c
+++ b/libcli/smb/smb2cli_query_info.c
@@ -222,7 +222,7 @@ NTSTATUS smb2cli_query_info(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER_MIX;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb2cli_read.c b/libcli/smb/smb2cli_read.c
index 11bcae7..0adb403 100644
--- a/libcli/smb/smb2cli_read.c
+++ b/libcli/smb/smb2cli_read.c
@@ -165,7 +165,7 @@ NTSTATUS smb2cli_read(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb2cli_session.c b/libcli/smb/smb2cli_session.c
index d34fbd4..537c171 100644
--- a/libcli/smb/smb2cli_session.c
+++ b/libcli/smb/smb2cli_session.c
@@ -313,7 +313,7 @@ NTSTATUS smb2cli_logoff(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb2cli_set_info.c b/libcli/smb/smb2cli_set_info.c
index 0ac4703..d5c7e58 100644
--- a/libcli/smb/smb2cli_set_info.c
+++ b/libcli/smb/smb2cli_set_info.c
@@ -155,7 +155,7 @@ NTSTATUS smb2cli_set_info(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER_MIX;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smb2cli_write.c b/libcli/smb/smb2cli_write.c
index e7d7f75..8e65460 100644
--- a/libcli/smb/smb2cli_write.c
+++ b/libcli/smb/smb2cli_write.c
@@ -140,7 +140,7 @@ NTSTATUS smb2cli_write(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 421e884..4c60a05 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -561,7 +561,7 @@ NTSTATUS smbXcli_conn_samba_suicide(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER_MIX;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
@@ -4430,7 +4430,7 @@ NTSTATUS smbXcli_negprot(struct smbXcli_conn *conn,
status = NT_STATUS_INVALID_PARAMETER_MIX;
goto fail;
}
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
goto fail;
}
diff --git a/librpc/rpc/binding_handle.c b/librpc/rpc/binding_handle.c
index 1e90827..89ada1d 100644
--- a/librpc/rpc/binding_handle.c
+++ b/librpc/rpc/binding_handle.c
@@ -209,7 +209,7 @@ NTSTATUS dcerpc_binding_handle_raw_call(struct dcerpc_binding_handle *h,
if (h->sync_ev) {
ev = h->sync_ev;
} else {
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
}
if (ev == NULL) {
talloc_free(frame);
@@ -524,7 +524,7 @@ NTSTATUS dcerpc_binding_handle_call(struct dcerpc_binding_handle *h,
if (h->sync_ev) {
ev = h->sync_ev;
} else {
- ev = tevent_context_init(frame);
+ ev = samba_tevent_context_init(frame);
}
if (ev == NULL) {
talloc_free(frame);
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 651d286..e27875f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -480,7 +480,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
../lib/util/charset/iconv.o ../lib/util/charset/weird.o \
../lib/util/charset/charset_macosxfs.o intl/lang_tdb.o \
lib/adt_tree.o lib/gencache.o \
- ../lib/util/modules.o lib/events.o @LIBTEVENT_OBJ0@ \
+ ../lib/util/modules.o lib/events.o ../lib/util/tevent_debug.o @LIBTEVENT_OBJ0@ \
@CCAN_OBJ@ \
lib/server_contexts.o \
lib/server_prefork.o \
diff --git a/source3/include/event.h b/source3/include/event.h
index fad5de7..108026e 100644
--- a/source3/include/event.h
+++ b/source3/include/event.h
@@ -18,17 +18,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#define TEVENT_COMPAT_DEFINES
#include <tevent.h>
-#undef event_context_init
-#define event_context_init(mem_ctx) s3_tevent_context_init(mem_ctx)
-
/* The following definitions come from lib/events.c */
struct pollfd;
-struct timeval *get_timed_events_timeout(struct event_context *event_ctx,
+struct timeval *get_timed_events_timeout(struct tevent_context *event_ctx,
struct timeval *to_ret);
-void dump_event_list(struct event_context *event_ctx);
+void dump_event_list(struct tevent_context *event_ctx);
struct tevent_context *s3_tevent_context_init(TALLOC_CTX *mem_ctx);
bool event_add_to_poll_args(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
@@ -37,7 +33,7 @@ bool event_add_to_poll_args(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
bool run_events_poll(struct tevent_context *ev, int pollrtn,
struct pollfd *pfds, int num_pfds);
-struct idle_event *event_add_idle(struct event_context *event_ctx,
+struct idle_event *event_add_idle(struct tevent_context *event_ctx,
TALLOC_CTX *mem_ctx,
struct timeval interval,
const char *name,
diff --git a/source3/include/messages.h b/source3/include/messages.h
index 4b45901..12fc439 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -77,7 +77,7 @@ struct messaging_rec;
struct messaging_context {
struct server_id id;
- struct event_context *event_ctx;
+ struct tevent_context *event_ctx;
struct messaging_callback *callbacks;
struct messaging_backend *local;
@@ -111,7 +111,7 @@ bool message_send_all(struct messaging_context *msg_ctx,
const void *buf, size_t len,
int *n_sent);
struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
- struct event_context *ev);
+ struct tevent_context *ev);
struct server_id messaging_server_id(const struct messaging_context *msg_ctx);
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 925039d..77b9490 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -392,7 +392,7 @@ ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, off_t pos);
int set_blocking(int fd, bool set);
NTSTATUS init_before_fork(void);
NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
- struct event_context *ev_ctx,
+ struct tevent_context *ev_ctx,
bool parent_longlived);
void *malloc_(size_t size);
void *Realloc(void *p, size_t size, bool free_old_on_error);
@@ -607,13 +607,13 @@ int open_socket_in(int type,
NTSTATUS open_socket_out(const struct sockaddr_storage *pss, uint16_t port,
int timeout, int *pfd);
struct tevent_req *open_socket_out_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
const struct sockaddr_storage *pss,
uint16_t port,
int timeout);
NTSTATUS open_socket_out_recv(struct tevent_req *req, int *pfd);
struct tevent_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
struct timeval wait_time,
const struct sockaddr_storage *pss,
uint16_t port,
diff --git a/source3/include/smb.h b/source3/include/smb.h
index a163e9e..0d16e56 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -144,7 +144,7 @@ struct notify_event;
struct notify_change_request;
struct sys_notify_backend;
struct sys_notify_context {
- struct event_context *ev;
+ struct tevent_context *ev;
void *private_data; /* For use by the system backend */
};
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index ea944cf..ec5ff1c 100644
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -53,7 +53,7 @@ struct smbldap_state {
time_t last_use; /* monotonic */
struct tevent_context *tevent_context;
- struct timed_event *idle_event;
+ struct tevent_timer *idle_event;
struct timeval last_rebind; /* monotonic */
};
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index d60cb5e..6d9be77 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -213,14 +213,14 @@ typedef struct files_struct {
uint32 share_access; /* NTCreateX share constants (FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE). */
bool update_write_time_triggered;
- struct timed_event *update_write_time_event;
+ struct tevent_timer *update_write_time_event;
bool update_write_time_on_close;
struct timespec close_write_time;
bool write_time_forced;
int oplock_type;
int sent_oplock_break;
- struct timed_event *oplock_timeout;
--
Samba Shared Repository
More information about the samba-cvs
mailing list