Mailing List Archive

[openssh] 01/02: upstream: fix recursive remote-remote copies of directories that
This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 5e1dfe5014ebc194641678303e22ab3bba15f4e5
Author: djm@openbsd.org <djm@openbsd.org>
Date: Fri Sep 8 06:10:02 2023 +0000

upstream: fix recursive remote-remote copies of directories that

contain symlinks to other directories (similar to bz3611)

OpenBSD-Commit-ID: 7e19d2ae09b4f941bf8eecc3955c9120171da37f
---
sftp-client.c | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/sftp-client.c b/sftp-client.c
index 8153c3d2..2598029f 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.173 2023/09/08 05:56:13 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.174 2023/09/08 06:10:02 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -2706,7 +2706,7 @@ crossload_dir_internal(struct sftp_conn *from, struct sftp_conn *to,
SFTP_DIRENT **dir_entries;
char *filename, *new_from_path = NULL, *new_to_path = NULL;
mode_t mode = 0777;
- Attrib curdir, ldirattrib, newdir;
+ Attrib *a, curdir, ldirattrib, newdir, lsym;

debug2_f("crossload dir src \"%s\" to dst \"%s\"", from_path, to_path);

@@ -2771,25 +2771,33 @@ crossload_dir_internal(struct sftp_conn *from, struct sftp_conn *to,
new_from_path = sftp_path_append(from_path, filename);
new_to_path = sftp_path_append(to_path, filename);

- if (S_ISDIR(dir_entries[i]->a.perm)) {
+ a = &dir_entries[i]->a;
+ if (S_ISLNK(a->perm)) {
+ if (!follow_link_flag) {
+ logit("%s: not a regular file", filename);
+ continue;
+ }
+ /* Replace the stat contents with the symlink target */
+ if (sftp_stat(from, new_from_path, 1, &lsym) != 0) {
+ logit("remote stat \"%s\" failed",
+ new_from_path);
+ ret = -1;
+ continue;
+ }
+ a = &lsym;
+ }
+ if (S_ISDIR(a->perm)) {
if (strcmp(filename, ".") == 0 ||
strcmp(filename, "..") == 0)
continue;
if (crossload_dir_internal(from, to,
new_from_path, new_to_path,
- depth + 1, &(dir_entries[i]->a), preserve_flag,
+ depth + 1, a, preserve_flag,
print_flag, follow_link_flag) == -1)
ret = -1;
- } else if (S_ISREG(dir_entries[i]->a.perm) ||
- (follow_link_flag && S_ISLNK(dir_entries[i]->a.perm))) {
- /*
- * If this is a symlink then don't send the link's
- * Attrib. sftp_download() will do a FXP_STAT operation
- * and get the link target's attributes.
- */
- if (sftp_crossload(from, to, new_from_path, new_to_path,
- S_ISLNK(dir_entries[i]->a.perm) ? NULL :
- &(dir_entries[i]->a), preserve_flag) == -1) {
+ } else if (S_ISREG(a->perm)) {
+ if (sftp_crossload(from, to, new_from_path,
+ new_to_path, a, preserve_flag) == -1) {
error("crossload \"%s\" to \"%s\" failed",
new_from_path, new_to_path);
ret = -1;

--
To stop receiving notification emails like this one, please contact
djm@mindrot.org.
_______________________________________________
openssh-commits mailing list
openssh-commits@mindrot.org
https://lists.mindrot.org/mailman/listinfo/openssh-commits