diff options
| author | Luk Claes <luk@debian.org> | 2012-05-19 17:31:50 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-05-28 14:49:45 +0200 |
| commit | 4f6f4ea93c83fa5154f450e2e43649467e4c2b32 (patch) | |
| tree | 5d765e8b1d8bcf9215a4dce43585a69ccfc66819 /source3/libsmb/clidfs.c | |
| parent | 987e81b0ee681a25a8e3308169626a2206e3fd26 (diff) | |
| download | samba-4f6f4ea93c83fa5154f450e2e43649467e4c2b32.tar.gz samba-4f6f4ea93c83fa5154f450e2e43649467e4c2b32.tar.bz2 samba-4f6f4ea93c83fa5154f450e2e43649467e4c2b32.zip | |
s3:libsmb: get rid of cli_state_remote_name
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/libsmb/clidfs.c')
| -rw-r--r-- | source3/libsmb/clidfs.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c index 4e9ac0cd26..2c1539c39d 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -25,6 +25,7 @@ #include "msdfs.h" #include "trans2.h" #include "libsmb/nmblib.h" +#include "../libcli/smb/smbXcli_base.h" /******************************************************************** Important point. @@ -329,7 +330,7 @@ static struct cli_state *cli_cm_find(struct cli_state *cli, /* Search to the start of the list. */ for (p = cli; p; p = DLIST_PREV(p)) { const char *remote_name = - cli_state_remote_name(p); + smbXcli_conn_remote_name(p->conn); if (strequal(server, remote_name) && strequal(share,p->share)) { @@ -340,7 +341,7 @@ static struct cli_state *cli_cm_find(struct cli_state *cli, /* Search to the end of the list. */ for (p = cli->next; p; p = p->next) { const char *remote_name = - cli_state_remote_name(p); + smbXcli_conn_remote_name(p->conn); if (strequal(server, remote_name) && strequal(share,p->share)) { @@ -412,7 +413,7 @@ void cli_cm_display(struct cli_state *cli) for (i=0; cli; cli = cli->next,i++ ) { d_printf("%d:\tserver=%s, share=%s\n", - i, cli_state_remote_name(cli), cli->share); + i, smbXcli_conn_remote_name(cli->conn), cli->share); } } @@ -579,7 +580,7 @@ static char *cli_dfs_make_full_path(TALLOC_CTX *ctx, } return talloc_asprintf(ctx, "%c%s%c%s%c%s", path_sep, - cli_state_remote_name(cli), + smbXcli_conn_remote_name(cli->conn), path_sep, cli->share, path_sep, @@ -859,7 +860,7 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx, status = cli_cm_open(ctx, rootcli, - cli_state_remote_name(rootcli), + smbXcli_conn_remote_name(rootcli->conn), "IPC$", dfs_auth_info, false, @@ -1044,7 +1045,7 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx, return false; } - remote_name = cli_state_remote_name(cli); + remote_name = smbXcli_conn_remote_name(cli->conn); cnum = cli_state_get_tid(cli); /* special case. never check for a referral on the IPC$ share */ |