summaryrefslogtreecommitdiff
path: root/sftp-client.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-08-23 22:56:08 +0100
committerColin Watson <cjwatson@debian.org>2010-08-23 22:56:08 +0100
commit31e30b835fd9695d3b6647cab4867001b092e28f (patch)
tree138e715c25661825457c7280cd66e3f4853d474c /sftp-client.c
parent78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff)
parent43094ebf14c9b16f1ea398bc5b65a7335e947288 (diff)
merge 5.6p1
Diffstat (limited to 'sftp-client.c')
-rw-r--r--sftp-client.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sftp-client.c b/sftp-client.c
index 6124c0f40..9dab47780 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.c,v 1.90 2009/10/11 10:41:26 dtucker Exp $ */ 1/* $OpenBSD: sftp-client.c,v 1.92 2010/07/19 03:16:33 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -713,7 +713,8 @@ do_realpath(struct sftp_conn *conn, char *path)
713 u_int status = buffer_get_int(&msg); 713 u_int status = buffer_get_int(&msg);
714 714
715 error("Couldn't canonicalise: %s", fx2txt(status)); 715 error("Couldn't canonicalise: %s", fx2txt(status));
716 return(NULL); 716 buffer_free(&msg);
717 return NULL;
717 } else if (type != SSH2_FXP_NAME) 718 } else if (type != SSH2_FXP_NAME)
718 fatal("Expected SSH2_FXP_NAME(%u) packet, got %u", 719 fatal("Expected SSH2_FXP_NAME(%u) packet, got %u",
719 SSH2_FXP_NAME, type); 720 SSH2_FXP_NAME, type);
@@ -1522,7 +1523,7 @@ upload_dir_internal(struct sftp_conn *conn, char *src, char *dst,
1522 continue; 1523 continue;
1523 1524
1524 if (upload_dir_internal(conn, new_src, new_dst, 1525 if (upload_dir_internal(conn, new_src, new_dst,
1525 pflag, depth + 1, printflag) == -1) 1526 pflag, printflag, depth + 1) == -1)
1526 ret = -1; 1527 ret = -1;
1527 } else if (S_ISREG(sb.st_mode)) { 1528 } else if (S_ISREG(sb.st_mode)) {
1528 if (do_upload(conn, new_src, new_dst, pflag) == -1) { 1529 if (do_upload(conn, new_src, new_dst, pflag) == -1) {