diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 18 | ||||
| -rw-r--r-- | source3/libsmb/clientgen.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/clifile.c | 164 | ||||
| -rw-r--r-- | source3/libsmb/clifsinfo.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/clilist.c | 6 | ||||
| -rw-r--r-- | source3/libsmb/climessage.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/clioplock.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/clirap.c | 14 | ||||
| -rw-r--r-- | source3/libsmb/clirap.h | 8 | ||||
| -rw-r--r-- | source3/libsmb/clireadwrite.c | 28 | ||||
| -rw-r--r-- | source3/libsmb/clisymlink.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/namequery.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/proto.h | 96 |
13 files changed, 175 insertions, 175 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index c51451528a..52d8e0cf8c 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -298,7 +298,7 @@ static NTSTATUS cli_session_setup_lanman2(struct cli_state *cli, const char *use const char *workgroup) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -371,7 +371,7 @@ struct cli_session_setup_guest_state { static void cli_session_setup_guest_done(struct tevent_req *subreq); struct tevent_req *cli_session_setup_guest_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, struct tevent_req **psmbreq) { @@ -430,7 +430,7 @@ struct tevent_req *cli_session_setup_guest_create(TALLOC_CTX *mem_ctx, } struct tevent_req *cli_session_setup_guest_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli) { struct tevent_req *req, *subreq; @@ -535,7 +535,7 @@ NTSTATUS cli_session_setup_guest_recv(struct tevent_req *req) static NTSTATUS cli_session_setup_guest(struct cli_state *cli) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -740,7 +740,7 @@ static NTSTATUS cli_session_setup_plain(struct cli_state *cli, const char *workgroup) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -1102,7 +1102,7 @@ static NTSTATUS cli_session_setup_nt1(struct cli_state *cli, const char *user, const char *workgroup) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -2244,7 +2244,7 @@ struct cli_tcon_andx_state { static void cli_tcon_andx_done(struct tevent_req *subreq); struct tevent_req *cli_tcon_andx_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *share, const char *dev, const char *pass, int passlen, @@ -2396,7 +2396,7 @@ struct tevent_req *cli_tcon_andx_create(TALLOC_CTX *mem_ctx, } struct tevent_req *cli_tcon_andx_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *share, const char *dev, const char *pass, int passlen) @@ -2502,7 +2502,7 @@ NTSTATUS cli_tcon_andx(struct cli_state *cli, const char *share, const char *dev, const char *pass, int passlen) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 78d3c45a6c..821a134a6c 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -460,7 +460,7 @@ struct cli_echo_state { static void cli_echo_done(struct tevent_req *subreq); -struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct event_context *ev, +struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, uint16_t num_echos, DATA_BLOB data) { @@ -538,7 +538,7 @@ NTSTATUS cli_echo_recv(struct tevent_req *req) NTSTATUS cli_echo(struct cli_state *cli, uint16_t num_echos, DATA_BLOB data) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 71e5b864da..43218bfe70 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -281,7 +281,7 @@ struct cli_posix_link_internal_state { static void cli_posix_link_internal_done(struct tevent_req *subreq); static struct tevent_req *cli_posix_link_internal_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t level, const char *oldname, @@ -325,7 +325,7 @@ static void cli_posix_link_internal_done(struct tevent_req *subreq) ****************************************************************************/ struct tevent_req *cli_posix_symlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *oldname, const char *newname) @@ -344,7 +344,7 @@ NTSTATUS cli_posix_symlink(struct cli_state *cli, const char *newname) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -396,7 +396,7 @@ struct readlink_state { static void cli_posix_readlink_done(struct tevent_req *subreq); struct tevent_req *cli_posix_readlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, size_t len) @@ -485,7 +485,7 @@ NTSTATUS cli_posix_readlink(struct cli_state *cli, const char *fname, char *linkpath, size_t len) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -530,7 +530,7 @@ NTSTATUS cli_posix_readlink(struct cli_state *cli, const char *fname, ****************************************************************************/ struct tevent_req *cli_posix_hardlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *oldname, const char *newname) @@ -549,7 +549,7 @@ NTSTATUS cli_posix_hardlink(struct cli_state *cli, const char *newname) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -601,7 +601,7 @@ struct getfacl_state { static void cli_posix_getfacl_done(struct tevent_req *subreq); struct tevent_req *cli_posix_getfacl_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname) { @@ -661,7 +661,7 @@ NTSTATUS cli_posix_getfacl(struct cli_state *cli, char **retbuf) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -712,7 +712,7 @@ struct stat_state { static void cli_posix_stat_done(struct tevent_req *subreq); struct tevent_req *cli_posix_stat_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname) { @@ -792,7 +792,7 @@ NTSTATUS cli_posix_stat(struct cli_state *cli, SMB_STRUCT_STAT *sbuf) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -842,7 +842,7 @@ struct cli_posix_chown_chmod_internal_state { static void cli_posix_chown_chmod_internal_done(struct tevent_req *subreq); static struct tevent_req *cli_posix_chown_chmod_internal_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uint32_t mode, @@ -885,7 +885,7 @@ static void cli_posix_chown_chmod_internal_done(struct tevent_req *subreq) ****************************************************************************/ struct tevent_req *cli_posix_chmod_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, mode_t mode) @@ -905,7 +905,7 @@ NTSTATUS cli_posix_chmod_recv(struct tevent_req *req) NTSTATUS cli_posix_chmod(struct cli_state *cli, const char *fname, mode_t mode) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -950,7 +950,7 @@ NTSTATUS cli_posix_chmod(struct cli_state *cli, const char *fname, mode_t mode) ****************************************************************************/ struct tevent_req *cli_posix_chown_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uid_t uid, @@ -974,7 +974,7 @@ NTSTATUS cli_posix_chown(struct cli_state *cli, gid_t gid) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -1026,7 +1026,7 @@ struct cli_rename_state { }; struct tevent_req *cli_rename_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname_src, const char *fname_dst) @@ -1098,7 +1098,7 @@ NTSTATUS cli_rename_recv(struct tevent_req *req) NTSTATUS cli_rename(struct cli_state *cli, const char *fname_src, const char *fname_dst) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -1145,7 +1145,7 @@ struct cli_ntrename_internal_state { }; static struct tevent_req *cli_ntrename_internal_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname_src, const char *fname_dst, @@ -1218,7 +1218,7 @@ static NTSTATUS cli_ntrename_internal_recv(struct tevent_req *req) } struct tevent_req *cli_ntrename_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname_src, const char *fname_dst) @@ -1239,7 +1239,7 @@ NTSTATUS cli_ntrename_recv(struct tevent_req *req) NTSTATUS cli_ntrename(struct cli_state *cli, const char *fname_src, const char *fname_dst) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -1280,7 +1280,7 @@ NTSTATUS cli_ntrename(struct cli_state *cli, const char *fname_src, const char * ****************************************************************************/ struct tevent_req *cli_nt_hardlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname_src, const char *fname_dst) @@ -1301,7 +1301,7 @@ NTSTATUS cli_nt_hardlink_recv(struct tevent_req *req) NTSTATUS cli_nt_hardlink(struct cli_state *cli, const char *fname_src, const char *fname_dst) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -1348,7 +1348,7 @@ struct cli_unlink_state { }; struct tevent_req *cli_unlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uint16_t mayhave_attrs) @@ -1408,7 +1408,7 @@ NTSTATUS cli_unlink_recv(struct tevent_req *req) NTSTATUS cli_unlink(struct cli_state *cli, const char *fname, uint16_t mayhave_attrs) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -1455,7 +1455,7 @@ struct cli_mkdir_state { }; struct tevent_req *cli_mkdir_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *dname) { @@ -1512,7 +1512,7 @@ NTSTATUS cli_mkdir_recv(struct tevent_req *req) NTSTATUS cli_mkdir(struct cli_state *cli, const char *dname) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -1559,7 +1559,7 @@ struct cli_rmdir_state { }; struct tevent_req *cli_rmdir_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *dname) { @@ -1616,7 +1616,7 @@ NTSTATUS cli_rmdir_recv(struct tevent_req *req) NTSTATUS cli_rmdir(struct cli_state *cli, const char *dname) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -1670,7 +1670,7 @@ static void cli_nt_delete_on_close_done(struct tevent_req *subreq) } struct tevent_req *cli_nt_delete_on_close_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, bool flag) @@ -1726,7 +1726,7 @@ NTSTATUS cli_nt_delete_on_close_recv(struct tevent_req *req) NTSTATUS cli_nt_delete_on_close(struct cli_state *cli, uint16_t fnum, bool flag) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -1774,7 +1774,7 @@ struct cli_ntcreate_state { static void cli_ntcreate_done(struct tevent_req *subreq); struct tevent_req *cli_ntcreate_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uint32_t CreatFlags, @@ -1889,7 +1889,7 @@ NTSTATUS cli_ntcreate(struct cli_state *cli, uint16_t *pfid) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -1934,7 +1934,7 @@ struct cli_nttrans_create_state { static void cli_nttrans_create_done(struct tevent_req *subreq); struct tevent_req *cli_nttrans_create_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uint32_t CreatFlags, @@ -2074,7 +2074,7 @@ NTSTATUS cli_nttrans_create(struct cli_state *cli, uint16_t *pfid) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -2121,7 +2121,7 @@ struct cli_openx_state { static void cli_openx_done(struct tevent_req *subreq); struct tevent_req *cli_openx_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, int flags, int share_mode, struct tevent_req **psmbreq) @@ -2212,7 +2212,7 @@ struct tevent_req *cli_openx_create(TALLOC_CTX *mem_ctx, return req; } -struct tevent_req *cli_openx_send(TALLOC_CTX *mem_ctx, struct event_context *ev, +struct tevent_req *cli_openx_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, const char *fname, int flags, int share_mode) { @@ -2269,7 +2269,7 @@ NTSTATUS cli_openx(struct cli_state *cli, const char *fname, int flags, int share_mode, uint16_t *pfnum) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -2430,7 +2430,7 @@ struct cli_close_state { static void cli_close_done(struct tevent_req *subreq); struct tevent_req *cli_close_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, struct tevent_req **psubreq) @@ -2458,7 +2458,7 @@ struct tevent_req *cli_close_create(TALLOC_CTX *mem_ctx, } struct tevent_req *cli_close_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum) { @@ -2499,7 +2499,7 @@ NTSTATUS cli_close_recv(struct tevent_req *req) NTSTATUS cli_close(struct cli_state *cli, uint16_t fnum) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -2552,7 +2552,7 @@ static void cli_ftruncate_done(struct tevent_req *subreq) } struct tevent_req *cli_ftruncate_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t size) @@ -2609,7 +2609,7 @@ NTSTATUS cli_ftruncate_recv(struct tevent_req *req) NTSTATUS cli_ftruncate(struct cli_state *cli, uint16_t fnum, uint64_t size) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -2725,7 +2725,7 @@ struct cli_unlock_state { static void cli_unlock_done(struct tevent_req *subreq); struct tevent_req *cli_unlock_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t offset, @@ -2786,7 +2786,7 @@ NTSTATUS cli_unlock(struct cli_state *cli, uint32_t len) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -2890,7 +2890,7 @@ struct cli_unlock64_state { static void cli_unlock64_done(struct tevent_req *subreq); struct tevent_req *cli_unlock64_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t offset, @@ -2951,7 +2951,7 @@ NTSTATUS cli_unlock64(struct cli_state *cli, uint64_t len) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -3010,7 +3010,7 @@ static void cli_posix_unlock_internal_done(struct tevent_req *subreq) } static struct tevent_req *cli_posix_lock_internal_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t offset, @@ -3093,7 +3093,7 @@ static struct tevent_req *cli_posix_lock_internal_send(TALLOC_CTX *mem_ctx, ****************************************************************************/ struct tevent_req *cli_posix_lock_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t offset, @@ -3115,7 +3115,7 @@ NTSTATUS cli_posix_lock(struct cli_state *cli, uint16_t fnum, bool wait_lock, enum brl_type lock_type) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -3168,7 +3168,7 @@ NTSTATUS cli_posix_lock(struct cli_state *cli, uint16_t fnum, ****************************************************************************/ struct tevent_req *cli_posix_unlock_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t offset, @@ -3186,7 +3186,7 @@ NTSTATUS cli_posix_unlock_recv(struct tevent_req *req) NTSTATUS cli_posix_unlock(struct cli_state *cli, uint16_t fnum, uint64_t offset, uint64_t len) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -3244,7 +3244,7 @@ struct cli_getattrE_state { }; struct tevent_req *cli_getattrE_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum) { @@ -3336,7 +3336,7 @@ NTSTATUS cli_getattrE(struct cli_state *cli, time_t *write_time) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -3391,7 +3391,7 @@ struct cli_getatr_state { }; struct tevent_req *cli_getatr_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname) { @@ -3483,7 +3483,7 @@ NTSTATUS cli_getatr(struct cli_state *cli, time_t *write_time) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -3533,7 +3533,7 @@ struct cli_setattrE_state { }; struct tevent_req *cli_setattrE_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, time_t change_time, @@ -3592,7 +3592,7 @@ NTSTATUS cli_setattrE(struct cli_state *cli, time_t write_time) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -3645,7 +3645,7 @@ struct cli_setatr_state { }; struct tevent_req *cli_setatr_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uint16_t attr, @@ -3721,7 +3721,7 @@ NTSTATUS cli_setatr(struct cli_state *cli, time_t mtime) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -3768,7 +3768,7 @@ struct cli_chkpath_state { }; struct tevent_req *cli_chkpath_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname) { @@ -3825,7 +3825,7 @@ NTSTATUS cli_chkpath_recv(struct tevent_req *req) NTSTATUS cli_chkpath(struct cli_state *cli, const char *path) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; char *path2 = NULL; NTSTATUS status = NT_STATUS_OK; @@ -3889,7 +3889,7 @@ struct cli_dskattr_state { }; struct tevent_req *cli_dskattr_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli) { struct tevent_req *req = NULL, *subreq = NULL; @@ -3950,7 +3950,7 @@ NTSTATUS cli_dskattr_recv(struct tevent_req *req, int *bsize, int *total, int *a NTSTATUS cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -3999,7 +3999,7 @@ struct ctemp_state { }; struct tevent_req *cli_ctemp_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *path) { @@ -4103,7 +4103,7 @@ NTSTATUS cli_ctemp(struct cli_state *cli, char **out_path) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -4442,7 +4442,7 @@ NTSTATUS cli_get_ea_list_path(struct cli_state *cli, const char *path, struct ea_struct **pea_list) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -4553,7 +4553,7 @@ static void cli_posix_open_internal_done(struct tevent_req *subreq) } static struct tevent_req *cli_posix_open_internal_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, int flags, @@ -4624,7 +4624,7 @@ static struct tevent_req *cli_posix_open_internal_send(TALLOC_CTX *mem_ctx, } struct tevent_req *cli_posix_open_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, int flags, @@ -4655,7 +4655,7 @@ NTSTATUS cli_posix_open(struct cli_state *cli, const char *fname, { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -4697,7 +4697,7 @@ NTSTATUS cli_posix_open(struct cli_state *cli, const char *fname, } struct tevent_req *cli_posix_mkdir_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, mode_t mode) @@ -4714,7 +4714,7 @@ NTSTATUS cli_posix_mkdir_recv(struct tevent_req *req) NTSTATUS cli_posix_mkdir(struct cli_state *cli, const char *fname, mode_t mode) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -4765,7 +4765,7 @@ struct cli_posix_unlink_internal_state { static void cli_posix_unlink_internal_done(struct tevent_req *subreq); static struct tevent_req *cli_posix_unlink_internal_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uint16_t level) @@ -4800,7 +4800,7 @@ static void cli_posix_unlink_internal_done(struct tevent_req *subreq) } struct tevent_req *cli_posix_unlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname) { @@ -4820,7 +4820,7 @@ NTSTATUS cli_posix_unlink_recv(struct tevent_req *req) NTSTATUS cli_posix_unlink(struct cli_state *cli, const char *fname) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -4864,7 +4864,7 @@ NTSTATUS cli_posix_unlink(struct cli_state *cli, const char *fname) ****************************************************************************/ struct tevent_req *cli_posix_rmdir_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname) { @@ -4881,7 +4881,7 @@ NTSTATUS cli_posix_rmdir_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx) NTSTATUS cli_posix_rmdir(struct cli_state *cli, const char *fname) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev = NULL; + struct tevent_context *ev = NULL; struct tevent_req *req = NULL; NTSTATUS status = NT_STATUS_OK; @@ -5216,7 +5216,7 @@ NTSTATUS cli_qpathinfo(TALLOC_CTX *mem_ctx, struct cli_state *cli, uint8_t **rdata, uint32_t *num_rdata) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -5353,7 +5353,7 @@ NTSTATUS cli_qfileinfo(TALLOC_CTX *mem_ctx, struct cli_state *cli, uint8_t **rdata, uint32_t *num_rdata) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -5389,7 +5389,7 @@ struct cli_flush_state { static void cli_flush_done(struct tevent_req *subreq); struct tevent_req *cli_flush_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum) { @@ -5433,7 +5433,7 @@ NTSTATUS cli_flush_recv(struct tevent_req *req) NTSTATUS cli_flush(TALLOC_CTX *mem_ctx, struct cli_state *cli, uint16_t fnum) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -5578,7 +5578,7 @@ NTSTATUS cli_shadow_copy_data(TALLOC_CTX *mem_ctx, struct cli_state *cli, char ***pnames, int *pnum_names) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index 0d9a7ea44a..d7ac906b00 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -125,7 +125,7 @@ NTSTATUS cli_unix_extensions_version(struct cli_state *cli, uint16 *pmajor, uint32 *pcaphigh) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index aeeafddd46..b0d3a4e6e4 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -484,7 +484,7 @@ NTSTATUS cli_list_old(struct cli_state *cli, const char *mask, const char *, void *), void *state) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; struct file_info *finfo; @@ -819,7 +819,7 @@ NTSTATUS cli_list_trans(struct cli_state *cli, const char *mask, void *private_data) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; int i, num_finfo; struct file_info *finfo = NULL; @@ -934,7 +934,7 @@ NTSTATUS cli_list(struct cli_state *cli, const char *mask, uint16 attribute, void *), void *state) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; struct file_info *finfo; diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c index f0956c07ee..f0481faada 100644 --- a/source3/libsmb/climessage.c +++ b/source3/libsmb/climessage.c @@ -384,7 +384,7 @@ NTSTATUS cli_message(struct cli_state *cli, const char *host, const char *username, const char *message) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c index d9ab4145e2..0b19748bf6 100644 --- a/source3/libsmb/clioplock.c +++ b/source3/libsmb/clioplock.c @@ -31,7 +31,7 @@ struct cli_smb_oplock_break_waiter_state { static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq); struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli) { struct tevent_req *req, *subreq; diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 1dee699b5f..77e2fa351b 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -582,7 +582,7 @@ struct cli_qpathinfo1_state { static void cli_qpathinfo1_done(struct tevent_req *subreq); struct tevent_req *cli_qpathinfo1_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname) { @@ -671,7 +671,7 @@ NTSTATUS cli_qpathinfo1(struct cli_state *cli, uint16 *mode) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -758,7 +758,7 @@ struct cli_qpathinfo2_state { static void cli_qpathinfo2_done(struct tevent_req *subreq); struct tevent_req *cli_qpathinfo2_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname) { @@ -846,7 +846,7 @@ NTSTATUS cli_qpathinfo2(struct cli_state *cli, const char *fname, SMB_INO_T *ino) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -957,7 +957,7 @@ NTSTATUS cli_qpathinfo_streams(struct cli_state *cli, const char *fname, struct stream_struct **pstreams) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -1183,7 +1183,7 @@ struct cli_qpathinfo_basic_state { static void cli_qpathinfo_basic_done(struct tevent_req *subreq); struct tevent_req *cli_qpathinfo_basic_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname) { @@ -1245,7 +1245,7 @@ NTSTATUS cli_qpathinfo_basic(struct cli_state *cli, const char *name, SMB_STRUCT_STAT *sbuf, uint32 *attributes) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; diff --git a/source3/libsmb/clirap.h b/source3/libsmb/clirap.h index 32f1b11e1b..91628eaf20 100644 --- a/source3/libsmb/clirap.h +++ b/source3/libsmb/clirap.h @@ -42,7 +42,7 @@ bool cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, bool cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, const char *old_password); struct tevent_req *cli_qpathinfo1_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname); NTSTATUS cli_qpathinfo1_recv(struct tevent_req *req, @@ -65,7 +65,7 @@ NTSTATUS cli_setpathinfo_basic(struct cli_state *cli, const char *fname, time_t change_time, uint16 mode); struct tevent_req *cli_qpathinfo2_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname); NTSTATUS cli_qpathinfo2_recv(struct tevent_req *req, @@ -104,7 +104,7 @@ NTSTATUS cli_qfileinfo_basic(struct cli_state *cli, uint16_t fnum, struct timespec *change_time, SMB_INO_T *ino); struct tevent_req *cli_qpathinfo_basic_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname); NTSTATUS cli_qpathinfo_basic_recv(struct tevent_req *req, @@ -138,7 +138,7 @@ NTSTATUS cli_qfileinfo(TALLOC_CTX *mem_ctx, struct cli_state *cli, uint8_t **rdata, uint32_t *num_rdata); struct tevent_req *cli_flush_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum); NTSTATUS cli_flush_recv(struct tevent_req *req); diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index c6de32e549..75c1683427 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -123,7 +123,7 @@ struct cli_read_andx_state { static void cli_read_andx_done(struct tevent_req *subreq); struct tevent_req *cli_read_andx_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, off_t offset, size_t size, struct tevent_req **psmbreq) @@ -181,7 +181,7 @@ struct tevent_req *cli_read_andx_create(TALLOC_CTX *mem_ctx, } struct tevent_req *cli_read_andx_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, off_t offset, size_t size) { @@ -289,7 +289,7 @@ struct cli_readall_state { static void cli_readall_done(struct tevent_req *subreq); static struct tevent_req *cli_readall_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, off_t offset, size_t size) @@ -412,7 +412,7 @@ struct cli_pull_subreq { struct cli_pull_state { struct tevent_req *req; - struct event_context *ev; + struct tevent_context *ev; struct cli_state *cli; uint16_t fnum; off_t start_offset; @@ -473,7 +473,7 @@ static void cli_pull_read_done(struct tevent_req *read_req); */ struct tevent_req *cli_pull_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, off_t start_offset, off_t size, size_t window_size, @@ -684,7 +684,7 @@ NTSTATUS cli_pull(struct cli_state *cli, uint16_t fnum, void *priv, off_t *received) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; @@ -831,7 +831,7 @@ struct cli_write_andx_state { static void cli_write_andx_done(struct tevent_req *subreq); struct tevent_req *cli_write_andx_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint16_t mode, const uint8_t *buf, off_t offset, size_t size, @@ -894,7 +894,7 @@ struct tevent_req *cli_write_andx_create(TALLOC_CTX *mem_ctx, } struct tevent_req *cli_write_andx_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint16_t mode, const uint8_t *buf, off_t offset, size_t size) @@ -964,7 +964,7 @@ NTSTATUS cli_write_andx_recv(struct tevent_req *req, size_t *pwritten) } struct cli_writeall_state { - struct event_context *ev; + struct tevent_context *ev; struct cli_state *cli; uint16_t fnum; uint16_t mode; @@ -977,7 +977,7 @@ struct cli_writeall_state { static void cli_writeall_written(struct tevent_req *req); static struct tevent_req *cli_writeall_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint16_t mode, @@ -1070,7 +1070,7 @@ NTSTATUS cli_writeall(struct cli_state *cli, uint16_t fnum, uint16_t mode, size_t *pwritten) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -1108,7 +1108,7 @@ struct cli_push_write_state { }; struct cli_push_state { - struct event_context *ev; + struct tevent_context *ev; struct cli_state *cli; uint16_t fnum; uint16_t mode; @@ -1182,7 +1182,7 @@ static bool cli_push_write_setup(struct tevent_req *req, return true; } -struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct event_context *ev, +struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint16_t mode, off_t start_offset, size_t window_size, @@ -1299,7 +1299,7 @@ NTSTATUS cli_push(struct cli_state *cli, uint16_t fnum, uint16_t mode, void *priv) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_OK; diff --git a/source3/libsmb/clisymlink.c b/source3/libsmb/clisymlink.c index fbfafba37d..338f932c4e 100644 --- a/source3/libsmb/clisymlink.c +++ b/source3/libsmb/clisymlink.c @@ -201,7 +201,7 @@ NTSTATUS cli_symlink(struct cli_state *cli, const char *oldname, const char *newname, uint32_t flags) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; @@ -375,7 +375,7 @@ NTSTATUS cli_readlink(struct cli_state *cli, const char *fname, char **pprint_name, uint32_t *pflags) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 4202564121..d86c0ed909 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -1877,7 +1877,7 @@ NTSTATUS name_resolve_bcast(const char *name, int *return_count) { TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; + struct tevent_context *ev; struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h index f186feeef4..2d0e7820cb 100644 --- a/source3/libsmb/proto.h +++ b/source3/libsmb/proto.h @@ -39,11 +39,11 @@ NTSTATUS cli_session_setup(struct cli_state *cli, const char *ntpass, int ntpasslen, const char *workgroup); struct tevent_req *cli_session_setup_guest_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, struct tevent_req **psmbreq); struct tevent_req *cli_session_setup_guest_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli); NTSTATUS cli_session_setup_guest_recv(struct tevent_req *req); struct tevent_req *cli_ulogoff_send(TALLOC_CTX *mem_ctx, @@ -52,13 +52,13 @@ struct tevent_req *cli_ulogoff_send(TALLOC_CTX *mem_ctx, NTSTATUS cli_ulogoff_recv(struct tevent_req *req); NTSTATUS cli_ulogoff(struct cli_state *cli); struct tevent_req *cli_tcon_andx_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *share, const char *dev, const char *pass, int passlen, struct tevent_req **psmbreq); struct tevent_req *cli_tcon_andx_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *share, const char *dev, const char *pass, int passlen); @@ -176,7 +176,7 @@ uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid); bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive); uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs); time_t cli_state_server_time(struct cli_state *cli); -struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct event_context *ev, +struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, uint16_t num_echos, DATA_BLOB data); NTSTATUS cli_echo_recv(struct tevent_req *req); @@ -218,7 +218,7 @@ NTSTATUS cli_setpathinfo(struct cli_state *cli, size_t data_len); struct tevent_req *cli_posix_symlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *oldname, const char *newname); @@ -227,7 +227,7 @@ NTSTATUS cli_posix_symlink(struct cli_state *cli, const char *oldname, const char *newname); struct tevent_req *cli_posix_readlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, size_t len); @@ -236,7 +236,7 @@ NTSTATUS cli_posix_readlink_recv(struct tevent_req *req, struct cli_state *cli, NTSTATUS cli_posix_readlink(struct cli_state *cli, const char *fname, char *linkpath, size_t len); struct tevent_req *cli_posix_hardlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *oldname, const char *newname); @@ -247,7 +247,7 @@ NTSTATUS cli_posix_hardlink(struct cli_state *cli, uint32_t unix_perms_to_wire(mode_t perms); mode_t wire_perms_to_unix(uint32_t perms); struct tevent_req *cli_posix_getfacl_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname); NTSTATUS cli_posix_getfacl_recv(struct tevent_req *req, @@ -260,7 +260,7 @@ NTSTATUS cli_posix_getfacl(struct cli_state *cli, size_t *prb_size, char **retbuf); struct tevent_req *cli_posix_stat_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname); NTSTATUS cli_posix_stat_recv(struct tevent_req *req, @@ -269,14 +269,14 @@ NTSTATUS cli_posix_stat(struct cli_state *cli, const char *fname, SMB_STRUCT_STAT *sbuf); struct tevent_req *cli_posix_chmod_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, mode_t mode); NTSTATUS cli_posix_chmod_recv(struct tevent_req *req); NTSTATUS cli_posix_chmod(struct cli_state *cli, const char *fname, mode_t mode); struct tevent_req *cli_posix_chown_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uid_t uid, @@ -287,14 +287,14 @@ NTSTATUS cli_posix_chown(struct cli_state *cli, uid_t uid, gid_t gid); struct tevent_req *cli_rename_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname_src, const char *fname_dst); NTSTATUS cli_rename_recv(struct tevent_req *req); NTSTATUS cli_rename(struct cli_state *cli, const char *fname_src, const char *fname_dst); struct tevent_req *cli_ntrename_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname_src, const char *fname_dst); @@ -302,7 +302,7 @@ NTSTATUS cli_ntrename_recv(struct tevent_req *req); NTSTATUS cli_ntrename(struct cli_state *cli, const char *fname_src, const char *fname_dst); struct tevent_req *cli_nt_hardlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname_src, const char *fname_dst); @@ -310,7 +310,7 @@ NTSTATUS cli_nt_hardlink_recv(struct tevent_req *req); NTSTATUS cli_nt_hardlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); struct tevent_req *cli_unlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uint16_t mayhave_attrs); @@ -318,26 +318,26 @@ NTSTATUS cli_unlink_recv(struct tevent_req *req); NTSTATUS cli_unlink(struct cli_state *cli, const char *fname, uint16_t mayhave_attrs); struct tevent_req *cli_mkdir_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *dname); NTSTATUS cli_mkdir_recv(struct tevent_req *req); NTSTATUS cli_mkdir(struct cli_state *cli, const char *dname); struct tevent_req *cli_rmdir_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *dname); NTSTATUS cli_rmdir_recv(struct tevent_req *req); NTSTATUS cli_rmdir(struct cli_state *cli, const char *dname); struct tevent_req *cli_nt_delete_on_close_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, bool flag); NTSTATUS cli_nt_delete_on_close_recv(struct tevent_req *req); NTSTATUS cli_nt_delete_on_close(struct cli_state *cli, uint16_t fnum, bool flag); struct tevent_req *cli_ntcreate_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uint32_t CreatFlags, @@ -368,27 +368,27 @@ uint8_t *trans2_bytes_push_str(uint8_t *buf, bool ucs2, uint8_t *trans2_bytes_push_bytes(uint8_t *buf, const uint8_t *bytes, size_t num_bytes); struct tevent_req *cli_openx_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, int flags, int share_mode, struct tevent_req **psmbreq); -struct tevent_req *cli_openx_send(TALLOC_CTX *mem_ctx, struct event_context *ev, +struct tevent_req *cli_openx_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, const char *fname, int flags, int share_mode); NTSTATUS cli_openx_recv(struct tevent_req *req, uint16_t *fnum); NTSTATUS cli_openx(struct cli_state *cli, const char *fname, int flags, int share_mode, uint16_t *pfnum); NTSTATUS cli_open(struct cli_state *cli, const char *fname, int flags, int share_mode, uint16_t *pfnum); struct tevent_req *cli_close_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, struct tevent_req **psubreq); struct tevent_req *cli_close_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum); NTSTATUS cli_close_recv(struct tevent_req *req); NTSTATUS cli_close(struct cli_state *cli, uint16_t fnum); struct tevent_req *cli_ftruncate_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t size); @@ -400,7 +400,7 @@ NTSTATUS cli_locktype(struct cli_state *cli, uint16_t fnum, NTSTATUS cli_lock32(struct cli_state *cli, uint16_t fnum, uint32_t offset, uint32_t len, int timeout, enum brl_type lock_type); struct tevent_req *cli_unlock_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t offset, @@ -411,7 +411,7 @@ NTSTATUS cli_lock64(struct cli_state *cli, uint16_t fnum, uint64_t offset, uint64_t len, int timeout, enum brl_type lock_type); struct tevent_req *cli_unlock64_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t offset, @@ -419,7 +419,7 @@ struct tevent_req *cli_unlock64_send(TALLOC_CTX *mem_ctx, NTSTATUS cli_unlock64_recv(struct tevent_req *req); NTSTATUS cli_unlock64(struct cli_state *cli, uint16_t fnum, uint64_t offset, uint64_t len); struct tevent_req *cli_posix_lock_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t offset, @@ -431,7 +431,7 @@ NTSTATUS cli_posix_lock(struct cli_state *cli, uint16_t fnum, uint64_t offset, uint64_t len, bool wait_lock, enum brl_type lock_type); struct tevent_req *cli_posix_unlock_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint64_t offset, @@ -439,7 +439,7 @@ struct tevent_req *cli_posix_unlock_send(TALLOC_CTX *mem_ctx, NTSTATUS cli_posix_unlock_recv(struct tevent_req *req); NTSTATUS cli_posix_unlock(struct cli_state *cli, uint16_t fnum, uint64_t offset, uint64_t len); struct tevent_req *cli_getattrE_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum); NTSTATUS cli_getattrE_recv(struct tevent_req *req, @@ -456,7 +456,7 @@ NTSTATUS cli_getattrE(struct cli_state *cli, time_t *access_time, time_t *write_time); struct tevent_req *cli_setattrE_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, time_t change_time, @@ -469,7 +469,7 @@ NTSTATUS cli_setattrE(struct cli_state *cli, time_t access_time, time_t write_time); struct tevent_req *cli_getatr_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname); NTSTATUS cli_getatr_recv(struct tevent_req *req, @@ -482,7 +482,7 @@ NTSTATUS cli_getatr(struct cli_state *cli, off_t *size, time_t *write_time); struct tevent_req *cli_setatr_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uint16_t attr, @@ -493,19 +493,19 @@ NTSTATUS cli_setatr(struct cli_state *cli, uint16_t attr, time_t mtime); struct tevent_req *cli_chkpath_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname); NTSTATUS cli_chkpath_recv(struct tevent_req *req); NTSTATUS cli_chkpath(struct cli_state *cli, const char *path); struct tevent_req *cli_dskattr_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli); NTSTATUS cli_dskattr_recv(struct tevent_req *req, int *bsize, int *total, int *avail); NTSTATUS cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); struct tevent_req *cli_ctemp_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *path); NTSTATUS cli_ctemp_recv(struct tevent_req *req, @@ -535,7 +535,7 @@ NTSTATUS cli_get_ea_list_path(struct cli_state *cli, const char *path, size_t *pnum_eas, struct ea_struct **pea_list); struct tevent_req *cli_posix_open_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, int flags, @@ -544,7 +544,7 @@ NTSTATUS cli_posix_open_recv(struct tevent_req *req, uint16_t *pfnum); NTSTATUS cli_posix_open(struct cli_state *cli, const char *fname, int flags, mode_t mode, uint16_t *fnum); struct tevent_req *cli_posix_mkdir_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, mode_t mode); @@ -552,14 +552,14 @@ NTSTATUS cli_posix_mkdir_recv(struct tevent_req *req); NTSTATUS cli_posix_mkdir(struct cli_state *cli, const char *fname, mode_t mode); struct tevent_req *cli_posix_unlink_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname); NTSTATUS cli_posix_unlink_recv(struct tevent_req *req); NTSTATUS cli_posix_unlink(struct cli_state *cli, const char *fname); struct tevent_req *cli_posix_rmdir_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname); NTSTATUS cli_posix_rmdir_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx); @@ -578,7 +578,7 @@ NTSTATUS cli_notify(struct cli_state *cli, uint16_t fnum, uint32_t buffer_size, struct notify_change **pchanges); struct tevent_req *cli_nttrans_create_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, const char *fname, uint32_t CreatFlags, @@ -694,7 +694,7 @@ NTSTATUS cli_message(struct cli_state *cli, const char *host, /* The following definitions come from libsmb/clioplock.c */ struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli); NTSTATUS cli_smb_oplock_break_waiter_recv(struct tevent_req *req, uint16_t *pfnum, @@ -730,18 +730,18 @@ NTSTATUS cli_set_fs_quota_info(struct cli_state *cli, int quota_fnum, /* The following definitions come from libsmb/clireadwrite.c */ struct tevent_req *cli_read_andx_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, off_t offset, size_t size, struct tevent_req **psmbreq); struct tevent_req *cli_read_andx_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, off_t offset, size_t size); NTSTATUS cli_read_andx_recv(struct tevent_req *req, ssize_t *received, uint8_t **rcvbuf); struct tevent_req *cli_pull_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, off_t start_offset, off_t size, size_t window_size, @@ -759,7 +759,7 @@ NTSTATUS cli_read(struct cli_state *cli, uint16_t fnum, NTSTATUS cli_smbwrite(struct cli_state *cli, uint16_t fnum, char *buf, off_t offset, size_t size1, size_t *ptotal); struct tevent_req *cli_write_andx_create(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint16_t mode, const uint8_t *buf, off_t offset, size_t size, @@ -767,7 +767,7 @@ struct tevent_req *cli_write_andx_create(TALLOC_CTX *mem_ctx, int num_reqs_before, struct tevent_req **psmbreq); struct tevent_req *cli_write_andx_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint16_t mode, const uint8_t *buf, off_t offset, size_t size); @@ -777,7 +777,7 @@ NTSTATUS cli_writeall(struct cli_state *cli, uint16_t fnum, uint16_t mode, const uint8_t *buf, off_t offset, size_t size, size_t *pwritten); -struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct event_context *ev, +struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, uint16_t fnum, uint16_t mode, off_t start_offset, size_t window_size, |