diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-08-07 02:12:09 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-08-07 02:20:31 +0200 |
| commit | 7b1cbcb7599d9f6a3bbad79d412604aa1203b5ee (patch) | |
| tree | 77a90151569f40b2b0ccc8874aa326615489733e /sftp-client.h | |
| parent | upstream: fix incorrect directory permissions on scp -3 (diff) | |
| download | openssh-7b1cbcb7599d9f6a3bbad79d412604aa1203b5ee.tar.xz openssh-7b1cbcb7599d9f6a3bbad79d412604aa1203b5ee.zip | |
upstream: make scp(1) in SFTP mode follow symlinks like
traditional scp(1) ok markus@
OpenBSD-Commit-ID: 97255e55be37e8e26605e4ba1e69f9781765d231
Diffstat (limited to 'sftp-client.h')
| -rw-r--r-- | sftp-client.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sftp-client.h b/sftp-client.h index 1de6ba8fd..00707f7ce 100644 --- a/sftp-client.h +++ b/sftp-client.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.h,v 1.32 2021/08/07 00:08:52 djm Exp $ */ +/* $OpenBSD: sftp-client.h,v 1.33 2021/08/07 00:12:09 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> @@ -140,7 +140,7 @@ int do_download(struct sftp_conn *, const char *, const char *, * times if 'pflag' is set */ int download_dir(struct sftp_conn *, const char *, const char *, - Attrib *, int, int, int, int); + Attrib *, int, int, int, int, int); /* * Upload 'local_path' to 'remote_path'. Preserve permissions and times @@ -153,7 +153,7 @@ int do_upload(struct sftp_conn *, const char *, const char *, int, int, int); * times if 'pflag' is set */ int upload_dir(struct sftp_conn *, const char *, const char *, int, int, int, - int); + int, int); /* * Download a 'from_path' from the 'from' connection and upload it to @@ -170,7 +170,8 @@ do_crossload(struct sftp_conn *from, struct sftp_conn *to, */ int crossload_dir(struct sftp_conn *from, struct sftp_conn *to, const char *from_path, const char *to_path, - Attrib *dirattrib, int preserve_flag, int print_flag); + Attrib *dirattrib, int preserve_flag, int print_flag, + int follow_link_flag); /* Concatenate paths, taking care of slashes. Caller must free result. */ char *path_append(const char *, const char *); |