diff options
| author | Jeremy Allison <jra@samba.org> | 2009-01-02 12:49:49 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-01-02 12:49:49 -0800 |
| commit | 3d2d0203e57bacf0cd61cfb72780a4bd9aa42707 (patch) | |
| tree | fa3e05b704381f1881cfeeb16259553681988df4 /source3/client | |
| parent | 11576353f645d7d7f44a74d27545b946c6175658 (diff) | |
| download | samba-3d2d0203e57bacf0cd61cfb72780a4bd9aa42707.tar.gz samba-3d2d0203e57bacf0cd61cfb72780a4bd9aa42707.tar.bz2 samba-3d2d0203e57bacf0cd61cfb72780a4bd9aa42707.zip | |
Remove cli_cm_set_dest_ss() - removes the global dest_ss
from libsmb/clidfs.c. Keep the '-I<address>' option in
smbclient working. The intent is to remove all globals
from libsmb/clidfs.c.
Jeremy.
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index c63921aa1a..529f21ab30 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -78,6 +78,7 @@ static bool showacls = false; bool lowercase = false; static struct sockaddr_storage dest_ss; +static char dest_ss_str[INET6_ADDRSTRLEN]; #define SEPARATORS " \t\n\r" @@ -4043,7 +4044,8 @@ static int process_command_string(const char *cmd_in) /* establish the connection if not already */ if (!cli) { - cli = cli_cm_open(talloc_tos(), NULL, desthost, + cli = cli_cm_open(talloc_tos(), NULL, + have_ip ? dest_ss_str : desthost, service, true, smb_encrypt); if (!cli) { return 1; @@ -4508,7 +4510,8 @@ static int process(const char *base_directory) int rc = 0; cli = cli_cm_open(talloc_tos(), NULL, - desthost, service, true, smb_encrypt); + have_ip ? dest_ss_str : desthost, + service, true, smb_encrypt); if (!cli) { return 1; } @@ -4586,7 +4589,8 @@ static int do_tar_op(const char *base_directory) /* do we already have a connection? */ if (!cli) { cli = cli_cm_open(talloc_tos(), NULL, - desthost, service, true, smb_encrypt); + have_ip ? dest_ss_str : desthost, + service, true, smb_encrypt); if (!cli) return 1; } @@ -4792,8 +4796,7 @@ static int do_message_op(struct user_auth_info *auth_info) exit(1); } have_ip = true; - - cli_cm_set_dest_ss(&dest_ss); + print_sockaddr(dest_ss_str, sizeof(dest_ss_str), &dest_ss); } break; case 'E': |