diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-10-31 17:51:11 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-11-24 19:02:32 +0100 |
| commit | ee36217c408c5306f9fca12d64c0d5fbd3b2b31e (patch) | |
| tree | 69e0f068a89059b2c103cffd5ae87470ca86f32b | |
| parent | b378abe4555a342b0db7f12ca142591dfcb6ad3b (diff) | |
| download | samba-ee36217c408c5306f9fca12d64c0d5fbd3b2b31e.tar.gz samba-ee36217c408c5306f9fca12d64c0d5fbd3b2b31e.tar.bz2 samba-ee36217c408c5306f9fca12d64c0d5fbd3b2b31e.zip | |
s3:libsmb: make use of cli_tree_connect()
metze
| -rw-r--r-- | source3/libsmb/clidfs.c | 6 | ||||
| -rw-r--r-- | source3/libsmb/libsmb_server.c | 12 | ||||
| -rw-r--r-- | source3/libsmb/passchange.c | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c index 4d0e97a9b5..4e9ac0cd26 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -223,8 +223,8 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx, /* must be a normal share */ - status = cli_tcon_andx(c, sharename, "?????", - password, strlen(password)+1); + status = cli_tree_connect(c, sharename, "?????", + password, strlen(password)+1); if (!NT_STATUS_IS_OK(status)) { d_printf("tree connect failed: %s\n", nt_errstr(status)); cli_shutdown(c); @@ -1062,7 +1062,7 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx, /* check for the referral */ - if (!NT_STATUS_IS_OK(cli_tcon_andx(cli, "IPC$", "IPC", NULL, 0))) { + if (!NT_STATUS_IS_OK(cli_tree_connect(cli, "IPC$", "IPC", NULL, 0))) { return false; } diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c index deac46a59e..570b7ae849 100644 --- a/source3/libsmb/libsmb_server.c +++ b/source3/libsmb/libsmb_server.c @@ -314,9 +314,11 @@ SMBC_server_internal(TALLOC_CTX *ctx, * tid. */ - status = cli_tcon_andx(srv->cli, srv->cli->share, "?????", - *pp_password, - strlen(*pp_password)+1); + status = cli_tree_connect(srv->cli, + srv->cli->share, + "?????", + *pp_password, + strlen(*pp_password)+1); if (!NT_STATUS_IS_OK(status)) { errno = map_errno_from_nt_status(status); cli_shutdown(srv->cli); @@ -507,8 +509,8 @@ SMBC_server_internal(TALLOC_CTX *ctx, /* must be a normal share */ - status = cli_tcon_andx(c, share, "?????", *pp_password, - strlen(*pp_password)+1); + status = cli_tree_connect(c, share, "?????", *pp_password, + strlen(*pp_password)+1); if (!NT_STATUS_IS_OK(status)) { errno = map_errno_from_nt_status(status); cli_shutdown(c); diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c index 83fd9ebf1f..2f6ff51632 100644 --- a/source3/libsmb/passchange.c +++ b/source3/libsmb/passchange.c @@ -134,7 +134,7 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam } } - result = cli_tcon_andx(cli, "IPC$", "IPC", "", 1); + result = cli_tree_connect(cli, "IPC$", "IPC", "", 1); if (!NT_STATUS_IS_OK(result)) { if (asprintf(err_str, "machine %s rejected the tconX on the " "IPC$ share. Error was : %s.\n", |