From c8dda78e35294ad56f088c86201430442df2efce Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Feb 2013 09:08:19 +0100 Subject: s3:libsmb: make use of samba_tevent_context_init() Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source3/libsmb/cliconnect.c | 18 ++++----- source3/libsmb/clidgram.c | 2 +- source3/libsmb/clientgen.c | 4 +- source3/libsmb/clifile.c | 82 ++++++++++++++++++++-------------------- source3/libsmb/clifsinfo.c | 6 +-- source3/libsmb/clilist.c | 6 +-- source3/libsmb/climessage.c | 2 +- source3/libsmb/clirap.c | 8 ++-- source3/libsmb/clireadwrite.c | 6 +-- source3/libsmb/clisymlink.c | 4 +- source3/libsmb/namequery.c | 8 ++-- source3/libsmb/smb2cli_tcon.c | 4 +- source3/libsmb/smbsock_connect.c | 4 +- 13 files changed, 77 insertions(+), 77 deletions(-) (limited to 'source3/libsmb') diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 9ce013ee64..c51451528a 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -309,7 +309,7 @@ static NTSTATUS cli_session_setup_lanman2(struct cli_state *cli, const char *use status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -547,7 +547,7 @@ static NTSTATUS cli_session_setup_guest(struct cli_state *cli) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -751,7 +751,7 @@ static NTSTATUS cli_session_setup_plain(struct cli_state *cli, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -1113,7 +1113,7 @@ static NTSTATUS cli_session_setup_nt1(struct cli_state *cli, const char *user, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -1560,7 +1560,7 @@ static ADS_STATUS cli_session_setup_kerberos(struct cli_state *cli, if (smbXcli_conn_has_async_calls(cli->conn)) { return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER); } - ev = tevent_context_init(talloc_tos()); + ev = samba_tevent_context_init(talloc_tos()); if (ev == NULL) { goto fail; } @@ -1837,7 +1837,7 @@ static NTSTATUS cli_session_setup_ntlmssp(struct cli_state *cli, if (smbXcli_conn_has_async_calls(cli->conn)) { return NT_STATUS_INVALID_PARAMETER; } - ev = tevent_context_init(talloc_tos()); + ev = samba_tevent_context_init(talloc_tos()); if (ev == NULL) { goto fail; } @@ -2214,7 +2214,7 @@ NTSTATUS cli_ulogoff(struct cli_state *cli) if (smbXcli_conn_has_async_calls(cli->conn)) { return NT_STATUS_INVALID_PARAMETER; } - ev = tevent_context_init(talloc_tos()); + ev = samba_tevent_context_init(talloc_tos()); if (ev == NULL) { goto fail; } @@ -2514,7 +2514,7 @@ NTSTATUS cli_tcon_andx(struct cli_state *cli, const char *share, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -2630,7 +2630,7 @@ NTSTATUS cli_tdis(struct cli_state *cli) if (smbXcli_conn_has_async_calls(cli->conn)) { return NT_STATUS_INVALID_PARAMETER; } - ev = tevent_context_init(talloc_tos()); + ev = samba_tevent_context_init(talloc_tos()); if (ev == NULL) { goto fail; } diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c index 6e3ecb3865..ac4a00d423 100644 --- a/source3/libsmb/clidgram.c +++ b/source3/libsmb/clidgram.c @@ -453,7 +453,7 @@ NTSTATUS nbt_getdc(struct messaging_context *msg_ctx, struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; - ev = tevent_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 98ea7113a2..78d3c45a6c 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -550,7 +550,7 @@ NTSTATUS cli_echo(struct cli_state *cli, uint16_t num_echos, DATA_BLOB data) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -613,7 +613,7 @@ NTSTATUS cli_smb(TALLOC_CTX *mem_ctx, struct cli_state *cli, if (smbXcli_conn_has_async_calls(cli->conn)) { return NT_STATUS_INVALID_PARAMETER; } - ev = tevent_context_init(mem_ctx); + ev = samba_tevent_context_init(mem_ctx); if (ev == NULL) { goto fail; } diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index ca9b867d79..71e5b864da 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -252,7 +252,7 @@ NTSTATUS cli_setpathinfo(struct cli_state *cli, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = tevent_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -356,7 +356,7 @@ NTSTATUS cli_posix_symlink(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -497,7 +497,7 @@ NTSTATUS cli_posix_readlink(struct cli_state *cli, const char *fname, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -561,7 +561,7 @@ NTSTATUS cli_posix_hardlink(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -673,7 +673,7 @@ NTSTATUS cli_posix_getfacl(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -804,7 +804,7 @@ NTSTATUS cli_posix_stat(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -917,7 +917,7 @@ NTSTATUS cli_posix_chmod(struct cli_state *cli, const char *fname, mode_t mode) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -986,7 +986,7 @@ NTSTATUS cli_posix_chown(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -1110,7 +1110,7 @@ NTSTATUS cli_rename(struct cli_state *cli, const char *fname_src, const char *fn goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -1251,7 +1251,7 @@ NTSTATUS cli_ntrename(struct cli_state *cli, const char *fname_src, const char * goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -1313,7 +1313,7 @@ NTSTATUS cli_nt_hardlink(struct cli_state *cli, const char *fname_src, const cha goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -1420,7 +1420,7 @@ NTSTATUS cli_unlink(struct cli_state *cli, const char *fname, uint16_t mayhave_a goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -1524,7 +1524,7 @@ NTSTATUS cli_mkdir(struct cli_state *cli, const char *dname) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -1628,7 +1628,7 @@ NTSTATUS cli_rmdir(struct cli_state *cli, const char *dname) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -1738,7 +1738,7 @@ NTSTATUS cli_nt_delete_on_close(struct cli_state *cli, uint16_t fnum, bool flag) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -1901,7 +1901,7 @@ NTSTATUS cli_ntcreate(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -2085,7 +2085,7 @@ NTSTATUS cli_nttrans_create(struct cli_state *cli, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -2281,7 +2281,7 @@ NTSTATUS cli_openx(struct cli_state *cli, const char *fname, int flags, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -2511,7 +2511,7 @@ NTSTATUS cli_close(struct cli_state *cli, uint16_t fnum) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -2621,7 +2621,7 @@ NTSTATUS cli_ftruncate(struct cli_state *cli, uint16_t fnum, uint64_t size) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -2798,7 +2798,7 @@ NTSTATUS cli_unlock(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -2967,7 +2967,7 @@ NTSTATUS cli_unlock64(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -3132,7 +3132,7 @@ NTSTATUS cli_posix_lock(struct cli_state *cli, uint16_t fnum, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -3198,7 +3198,7 @@ NTSTATUS cli_posix_unlock(struct cli_state *cli, uint16_t fnum, uint64_t offset, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -3348,7 +3348,7 @@ NTSTATUS cli_getattrE(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -3495,7 +3495,7 @@ NTSTATUS cli_getatr(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -3604,7 +3604,7 @@ NTSTATUS cli_setattrE(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -3733,7 +3733,7 @@ NTSTATUS cli_setatr(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -3852,7 +3852,7 @@ NTSTATUS cli_chkpath(struct cli_state *cli, const char *path) } } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -3962,7 +3962,7 @@ NTSTATUS cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -4115,7 +4115,7 @@ NTSTATUS cli_ctemp(struct cli_state *cli, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -4453,7 +4453,7 @@ NTSTATUS cli_get_ea_list_path(struct cli_state *cli, const char *path, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -4667,7 +4667,7 @@ NTSTATUS cli_posix_open(struct cli_state *cli, const char *fname, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -4726,7 +4726,7 @@ NTSTATUS cli_posix_mkdir(struct cli_state *cli, const char *fname, mode_t mode) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -4832,7 +4832,7 @@ NTSTATUS cli_posix_unlink(struct cli_state *cli, const char *fname) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -4893,7 +4893,7 @@ NTSTATUS cli_posix_rmdir(struct cli_state *cli, const char *fname) goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -5089,7 +5089,7 @@ NTSTATUS cli_notify(struct cli_state *cli, uint16_t fnum, uint32_t buffer_size, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = tevent_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -5227,7 +5227,7 @@ NTSTATUS cli_qpathinfo(TALLOC_CTX *mem_ctx, struct cli_state *cli, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -5364,7 +5364,7 @@ NTSTATUS cli_qfileinfo(TALLOC_CTX *mem_ctx, struct cli_state *cli, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -5444,7 +5444,7 @@ NTSTATUS cli_flush(TALLOC_CTX *mem_ctx, struct cli_state *cli, uint16_t fnum) status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -5589,7 +5589,7 @@ NTSTATUS cli_shadow_copy_data(TALLOC_CTX *mem_ctx, struct cli_state *cli, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index 5a75161e3a..0d9a7ea44a 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -137,7 +137,7 @@ NTSTATUS cli_unix_extensions_version(struct cli_state *cli, uint16 *pmajor, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -245,7 +245,7 @@ NTSTATUS cli_set_unix_extensions_capabilities(struct cli_state *cli, if (smbXcli_conn_has_async_calls(cli->conn)) { return NT_STATUS_INVALID_PARAMETER; } - ev = tevent_context_init(talloc_tos()); + ev = samba_tevent_context_init(talloc_tos()); if (ev == NULL) { goto fail; } @@ -342,7 +342,7 @@ NTSTATUS cli_get_fs_attr_info(struct cli_state *cli, uint32_t *fs_attr) if (smbXcli_conn_has_async_calls(cli->conn)) { return NT_STATUS_INVALID_PARAMETER; } - ev = tevent_context_init(talloc_tos()); + ev = samba_tevent_context_init(talloc_tos()); if (ev == NULL) { goto fail; } diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index 056494e335..aeeafddd46 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -497,7 +497,7 @@ NTSTATUS cli_list_old(struct cli_state *cli, const char *mask, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -832,7 +832,7 @@ NTSTATUS cli_list_trans(struct cli_state *cli, const char *mask, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -948,7 +948,7 @@ NTSTATUS cli_list(struct cli_state *cli, const char *mask, uint16 attribute, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c index 4e99761bf3..f0956c07ee 100644 --- a/source3/libsmb/climessage.c +++ b/source3/libsmb/climessage.c @@ -396,7 +396,7 @@ NTSTATUS cli_message(struct cli_state *cli, const char *host, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 7c185ef5ad..1dee699b5f 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -682,7 +682,7 @@ NTSTATUS cli_qpathinfo1(struct cli_state *cli, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -857,7 +857,7 @@ NTSTATUS cli_qpathinfo2(struct cli_state *cli, const char *fname, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -968,7 +968,7 @@ NTSTATUS cli_qpathinfo_streams(struct cli_state *cli, const char *fname, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -1256,7 +1256,7 @@ NTSTATUS cli_qpathinfo_basic(struct cli_state *cli, const char *name, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index 3cc6cf8047..c6de32e549 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -696,7 +696,7 @@ NTSTATUS cli_pull(struct cli_state *cli, uint16_t fnum, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; @@ -1081,7 +1081,7 @@ NTSTATUS cli_writeall(struct cli_state *cli, uint16_t fnum, uint16_t mode, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -1311,7 +1311,7 @@ NTSTATUS cli_push(struct cli_state *cli, uint16_t fnum, uint16_t mode, goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { status = NT_STATUS_NO_MEMORY; goto fail; diff --git a/source3/libsmb/clisymlink.c b/source3/libsmb/clisymlink.c index d0a2deb355..fbfafba37d 100644 --- a/source3/libsmb/clisymlink.c +++ b/source3/libsmb/clisymlink.c @@ -209,7 +209,7 @@ NTSTATUS cli_symlink(struct cli_state *cli, const char *oldname, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -383,7 +383,7 @@ NTSTATUS cli_readlink(struct cli_state *cli, const char *fname, status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index b62b52bc70..4202564121 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -867,7 +867,7 @@ NTSTATUS node_status_query(TALLOC_CTX *mem_ctx, struct nmb_name *name, struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; - ev = tevent_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -1491,7 +1491,7 @@ NTSTATUS name_query(const char *name, int name_type, struct timeval timeout; NTSTATUS status = NT_STATUS_NO_MEMORY; - ev = tevent_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -1881,7 +1881,7 @@ NTSTATUS name_resolve_bcast(const char *name, struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; - ev = event_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -2225,7 +2225,7 @@ NTSTATUS resolve_wins(const char *name, struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; - ev = tevent_context_init(talloc_tos()); + ev = samba_tevent_context_init(talloc_tos()); if (ev == NULL) { goto fail; } diff --git a/source3/libsmb/smb2cli_tcon.c b/source3/libsmb/smb2cli_tcon.c index dc18544bff..ab97f8d0e1 100644 --- a/source3/libsmb/smb2cli_tcon.c +++ b/source3/libsmb/smb2cli_tcon.c @@ -166,7 +166,7 @@ NTSTATUS smb2cli_tcon(struct cli_state *cli, const char *share) status = NT_STATUS_INVALID_PARAMETER; goto fail; } - ev = tevent_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -264,7 +264,7 @@ NTSTATUS smb2cli_tdis(struct cli_state *cli) 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/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c index c5fd2c8431..403750d719 100644 --- a/source3/libsmb/smbsock_connect.c +++ b/source3/libsmb/smbsock_connect.c @@ -511,7 +511,7 @@ NTSTATUS smbsock_connect(const struct sockaddr_storage *addr, uint16_t port, struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; - ev = tevent_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } @@ -760,7 +760,7 @@ NTSTATUS smbsock_any_connect(const struct sockaddr_storage *addrs, struct tevent_req *req; NTSTATUS status = NT_STATUS_NO_MEMORY; - ev = tevent_context_init(frame); + ev = samba_tevent_context_init(frame); if (ev == NULL) { goto fail; } -- cgit