openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-05-01 17:46:35 +00:00
Code Issues Projects Releases Wiki Activity

same treatment for remote/remote copies (i.e. scp -3): adjust

Browse Source 
permissions on destination directory only if we created it or -p
was requested. bz3925
This commit is contained in:
djm
2026-02-18 03:04:12 +00:00
parent 5f549511a7
commit 2312e0c0c9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/ssh/sftp-client.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: sftp-client.c,v 1.183 2026/02/18 02:59:27 djm Exp $ */
/* $OpenBSD: sftp-client.c,v 1.184 2026/02/18 03:04:12 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -2679,7 +2679,7 @@ crossload_dir_internal(struct sftp_conn *from, struct sftp_conn *to,
int depth, Attrib *dirattrib, int preserve_flag, int print_flag,
int follow_link_flag)
{
int i, ret = 0;
int i, ret = 0, created = 0;
SFTP_DIRENT **dir_entries;
char *filename, *new_from_path = NULL, *new_to_path = NULL;
mode_t mode = 0777;
@@ -2725,7 +2725,9 @@ crossload_dir_internal(struct sftp_conn *from, struct sftp_conn *to,
* the path already existed and is a directory. Ensure we can
* write to the directory we create for the duration of the transfer.
*/
if (sftp_mkdir(to, to_path, &curdir, 0) != 0) {
if (sftp_mkdir(to, to_path, &curdir, 0) == 0)
created = 1;
else {
if (sftp_stat(to, to_path, 0, &newdir) != 0)
return -1;
if (!S_ISDIR(newdir.perm)) {
@@ -2787,7 +2789,8 @@ crossload_dir_internal(struct sftp_conn *from, struct sftp_conn *to,
free(new_to_path);
free(new_from_path);
sftp_setstat(to, to_path, &curdir);
if (created || preserve_flag)
sftp_setstat(to, to_path, &curdir);
sftp_free_dirents(dir_entries);