[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1108-g9d824dc

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  9d824dc115c7096ea555b135d58091e8620495d9 (commit)
      from  d20061abe379253f4b471dc89ddcbc1af32842bd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9d824dc115c7096ea555b135d58091e8620495d9
Author: Sam Liddicott <sam at liddicott.com>
Date:   Fri Aug 21 16:54:49 2009 +0200

    s4:client
    
    Put was assuming that the remote name was always absolute, and not relative to
    the current remote directory.
    
    Signed-off-by: Sam Liddicott <sam at liddicott.com>

-----------------------------------------------------------------------

Summary of changes:
 source4/client/client.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/client/client.c b/source4/client/client.c
index 82aeef3..3fa819c 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -1221,10 +1221,14 @@ static int cmd_put(struct smbclient_context *ctx, const char **args)
 
 	lname = talloc_strdup(ctx, args[1]);
   
-	if (args[2])
-		rname = talloc_strdup(ctx, args[2]);
-	else
+	if (args[2]) {
+		if (args[2][0]=='\\')
+			rname = talloc_strdup(ctx, args[2]);
+		else
+			rname = talloc_asprintf(ctx, "%s\\%s", ctx->remote_cur_dir, args[2]);
+	} else {
 		rname = talloc_asprintf(ctx, "%s\\%s", ctx->remote_cur_dir, lname);
+	}
 	
 	dos_clean_name(rname);
 


-- 
Samba Shared Repository