summaryrefslogtreecommitdiffstats
path: root/source3/client
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-05-09 22:39:20 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:51 -0500
commit6a3a0766d5772a33d888c51ac4d68d2fa3e504ae (patch)
tree0a489cbabf5156bb2db6cc645e6c90d4770d50d6 /source3/client
parent5df279f1444273fb8ba588d32f27f3239fa95e20 (diff)
downloadsamba-6a3a0766d5772a33d888c51ac4d68d2fa3e504ae.tar.gz
samba-6a3a0766d5772a33d888c51ac4d68d2fa3e504ae.tar.xz
samba-6a3a0766d5772a33d888c51ac4d68d2fa3e504ae.zip
r6685: smbclient fixes
* BUG 2680: copy files from an MSDFS win2k root share * BUG 2688: re-implement support for the -P (--port) option * support connecting to an 'msdfs proxy' share on a Samba server (This used to be commit 9e3e473632fee669eda477d8cbe309b7109552ea)
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/client.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 9cb0d15a68..0ada2e3a9a 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -734,9 +734,19 @@ static int do_get(char *rname, char *lname, BOOL reget)
return 1;
}
-
GetTimeOfDay(&tp_start);
+ if ( targetcli->dfsroot ) {
+ pstring path;
+
+ /* we need to refer to the full \server\share\path format
+ for dfs shares */
+
+ pstrcpy( path, targetname );
+ cli_dfs_make_full_path( targetname, targetcli->desthost,
+ targetcli->share, path);
+ }
+
fnum = cli_open(targetcli, targetname, O_RDONLY, DENY_NONE);
if (fnum == -1) {
@@ -3440,8 +3450,11 @@ static int do_message_op(void)
poptGetArg(pc);
- if ( have_ip )
-
+ /* check for the -P option */
+
+ if ( port != 0 )
+ cli_cm_set_port( port );
+
/*
* Don't load debug level from smb.conf. It should be
* set by cmdline arg or remain default (0)