tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

fix regression in openssh-6.8 sftp client: existing
 destination directories would incorrectly terminate recursive uploads;
 bz#2528

Upstream-ID: 3306be469f41f26758e3d447987ac6d662623e18
This commit is contained in:
djm@openbsd.org 2016-02-11 02:21:34 +00:00 committed by Damien Miller
parent 714e367226
commit e30cabfa4a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sftp-client.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp-client.c,v 1.120 2015/05/28 04:50:53 djm Exp $ */ /* $OpenBSD: sftp-client.c,v 1.121 2016/02/11 02:21:34 djm Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -1760,7 +1760,7 @@ do_upload(struct sftp_conn *conn, const char *local_path,
if (fsync_flag) if (fsync_flag)
(void)do_fsync(conn, handle, handle_len); (void)do_fsync(conn, handle, handle_len);
if (do_close(conn, handle, handle_len) != SSH2_FX_OK) if (do_close(conn, handle, handle_len) != 0)
status = SSH2_FX_FAILURE; status = SSH2_FX_FAILURE;
free(handle); free(handle);
@ -1773,12 +1773,11 @@ upload_dir_internal(struct sftp_conn *conn, const char *src, const char *dst,
int depth, int preserve_flag, int print_flag, int resume, int fsync_flag) int depth, int preserve_flag, int print_flag, int resume, int fsync_flag)
{ {
int ret = 0; int ret = 0;
u_int status;
DIR *dirp; DIR *dirp;
struct dirent *dp; struct dirent *dp;
char *filename, *new_src, *new_dst; char *filename, *new_src, *new_dst;
struct stat sb; struct stat sb;
Attrib a; Attrib a, *dirattrib;
if (depth >= MAX_DIR_DEPTH) { if (depth >= MAX_DIR_DEPTH) {
error("Maximum directory depth exceeded: %d levels", depth); error("Maximum directory depth exceeded: %d levels", depth);
@ -1805,17 +1804,18 @@ upload_dir_internal(struct sftp_conn *conn, const char *src, const char *dst,
if (!preserve_flag) if (!preserve_flag)
a.flags &= ~SSH2_FILEXFER_ATTR_ACMODTIME; a.flags &= ~SSH2_FILEXFER_ATTR_ACMODTIME;
status = do_mkdir(conn, dst, &a, 0);
/* /*
* we lack a portable status for errno EEXIST, * sftp lacks a portable status value to match errno EEXIST,
* so if we get a SSH2_FX_FAILURE back we must check * so if we get a failure back then we must check whether
* if it was created successfully. * the path already existed and is a directory.
*/ */
if (status != SSH2_FX_OK) { if (do_mkdir(conn, dst, &a, 0) != 0) {
if (status != SSH2_FX_FAILURE) if ((dirattrib = do_stat(conn, dst, 0)) == NULL)
return -1; return -1;
if (do_stat(conn, dst, 0) == NULL) if (!S_ISDIR(dirattrib->perm)) {
error("\"%s\" exists but is not a directory", dst);
return -1; return -1;
}
} }
if ((dirp = opendir(src)) == NULL) { if ((dirp = opendir(src)) == NULL) {