r24036: Fix dfs rename bug in smbclient reported by Thomas Bork <tombork@web.de>.

Couldn't rename file as we weren't DFS enabling the target path.
Jeremy.
(This used to be commit cd66c133a1b010874ea9e7a500ea24c52011e523)

diff --git a/source3/client/client.c b/source3/client/client.c
index f2a5f8593fa22b26cb95950912d4b3a0f60af1a3..ce66e089304578b5e86d57dc805a50b6ce2352f7 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2727,7 +2727,8 @@ static int cmd_rename(void)
        pstring src,dest;
        pstring buf,buf2;
        struct cli_state *targetcli;
-       pstring targetname;
+       pstring targetsrc;
+       pstring targetdest;
   
        pstrcpy(src,cur_dir);
        pstrcpy(dest,cur_dir);
@@ -2741,13 +2742,21 @@ static int cmd_rename(void)
        pstrcat(src,buf);
        pstrcat(dest,buf2);
 
-       if ( !cli_resolve_path( "", cli, src, &targetcli, targetname ) ) {
-               d_printf("chown %s: %s\n", src, cli_errstr(cli));
+       if ( !cli_resolve_path( "", cli, src, &targetcli, targetsrc ) ) {
+               d_printf("rename %s: %s\n", src, cli_errstr(cli));
+               return 1;
+       }
+
+       if ( !cli_resolve_path( "", cli, dest, &targetcli, targetdest ) ) {
+               d_printf("rename %s: %s\n", dest, cli_errstr(cli));
                return 1;
        }
 
-       if (!cli_rename(targetcli, targetname, dest)) {
-               d_printf("%s renaming files\n",cli_errstr(targetcli));
+       if (!cli_rename(targetcli, targetsrc, targetdest)) {
+               d_printf("%s renaming files %s -> %s \n",
+                       cli_errstr(targetcli),
+                       targetsrc,
+                       targetdest);
                return 1;
        }