Import openssh_8.0p1.orig.tar.gz

1 files changed, 47 insertions, 11 deletions

diff --git a/sftp-client.c b/sftp-client.c
index 4986d6d8d..73e3c2f53 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.130 2018/07/31 03:07:24 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.133 2019/01/24 16:52:17 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -86,6 +86,7 @@ struct sftp_conn {
 #define SFTP_EXT_FSTATVFS       0x00000004
 #define SFTP_EXT_HARDLINK       0x00000008
 #define SFTP_EXT_FSYNC          0x00000010
+#define SFTP_EXT_LSETSTAT       0x00000020
         u_int exts;
         u_int64_t limit_kbps;
         struct bwlimit bwlimit_in, bwlimit_out;
@@ -101,7 +102,9 @@ sftpio(void *_bwlimit, size_t amount)
 {
         struct bwlimit *bwlimit = (struct bwlimit *)_bwlimit;
 
-        bandwidth_limit(bwlimit, amount);
+        refresh_progress_meter(0);
+        if (bwlimit != NULL)
+                bandwidth_limit(bwlimit, amount);
         return 0;
 }
 
@@ -121,8 +124,8 @@ send_msg(struct sftp_conn *conn, struct sshbuf *m)
         iov[1].iov_base = (u_char *)sshbuf_ptr(m);
         iov[1].iov_len = sshbuf_len(m);
 
-        if (atomiciov6(writev, conn->fd_out, iov, 2,
-            conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_out) !=
+        if (atomiciov6(writev, conn->fd_out, iov, 2, sftpio,
+            conn->limit_kbps > 0 ? &conn->bwlimit_out : NULL) !=
             sshbuf_len(m) + sizeof(mlen))
                 fatal("Couldn't send packet: %s", strerror(errno));
 
@@ -138,8 +141,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial)
 
         if ((r = sshbuf_reserve(m, 4, &p)) != 0)
                 fatal("%s: buffer error: %s", __func__, ssh_err(r));
-        if (atomicio6(read, conn->fd_in, p, 4,
-            conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) != 4) {
+        if (atomicio6(read, conn->fd_in, p, 4, sftpio,
+            conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL) != 4) {
                 if (errno == EPIPE || errno == ECONNRESET)
                         fatal("Connection closed");
                 else
@@ -157,8 +160,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial)
 
         if ((r = sshbuf_reserve(m, msg_len, &p)) != 0)
                 fatal("%s: buffer error: %s", __func__, ssh_err(r));
-        if (atomicio6(read, conn->fd_in, p, msg_len,
-            conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in)
+        if (atomicio6(read, conn->fd_in, p, msg_len, sftpio,
+            conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL)
             != msg_len) {
                 if (errno == EPIPE)
                         fatal("Connection closed");
@@ -463,6 +466,10 @@ do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests,
                     strcmp((char *)value, "1") == 0) {
                         ret->exts |= SFTP_EXT_FSYNC;
                         known = 1;
+                } else if (strcmp(name, "lsetstat@openssh.com") == 0 &&
+                    strcmp((char *)value, "1") == 0) {
+                        ret->exts |= SFTP_EXT_LSETSTAT;
+                        known = 1;
                 }
                 if (known) {
                         debug2("Server supports extension \"%s\" revision %s",
@@ -1096,7 +1103,6 @@ do_statvfs(struct sftp_conn *conn, const char *path, struct sftp_statvfs *st,
 
         if ((msg = sshbuf_new()) == NULL)
                 fatal("%s: sshbuf_new failed", __func__);
-        sshbuf_reset(msg);
         if ((r = sshbuf_put_u8(msg, SSH2_FXP_EXTENDED)) != 0 ||
             (r = sshbuf_put_u32(msg, id)) != 0 ||
             (r = sshbuf_put_cstring(msg, "statvfs@openssh.com")) != 0 ||
@@ -1125,7 +1131,6 @@ do_fstatvfs(struct sftp_conn *conn, const u_char *handle, u_int handle_len,
 
         if ((msg = sshbuf_new()) == NULL)
                 fatal("%s: sshbuf_new failed", __func__);
-        sshbuf_reset(msg);
         if ((r = sshbuf_put_u8(msg, SSH2_FXP_EXTENDED)) != 0 ||
             (r = sshbuf_put_u32(msg, id)) != 0 ||
             (r = sshbuf_put_cstring(msg, "fstatvfs@openssh.com")) != 0 ||
@@ -1138,6 +1143,38 @@ do_fstatvfs(struct sftp_conn *conn, const u_char *handle, u_int handle_len,
 }
 #endif
 
+int
+do_lsetstat(struct sftp_conn *conn, const char *path, Attrib *a)
+{
+        struct sshbuf *msg;
+        u_int status, id;
+        int r;
+
+        if ((conn->exts & SFTP_EXT_LSETSTAT) == 0) {
+                error("Server does not support lsetstat@openssh.com extension");
+                return -1;
+        }
+
+        id = conn->msg_id++;
+        if ((msg = sshbuf_new()) == NULL)
+                fatal("%s: sshbuf_new failed", __func__);
+        if ((r = sshbuf_put_u8(msg, SSH2_FXP_EXTENDED)) != 0 ||
+            (r = sshbuf_put_u32(msg, id)) != 0 ||
+            (r = sshbuf_put_cstring(msg, "lsetstat@openssh.com")) != 0 ||
+            (r = sshbuf_put_cstring(msg, path)) != 0 ||
+            (r = encode_attrib(msg, a)) != 0)
+                fatal("%s: buffer error: %s", __func__, ssh_err(r));
+        send_msg(conn, msg);
+        sshbuf_free(msg);
+
+        status = get_status(conn, id);
+        if (status != SSH2_FX_OK)
+                error("Couldn't setstat on \"%s\": %s", path,
+                    fx2txt(status));
+
+        return status == SSH2_FX_OK ? 0 : -1;
+}
+
 static void
 send_read_request(struct sftp_conn *conn, u_int id, u_int64_t offset,
     u_int len, const u_char *handle, u_int handle_len)
@@ -1147,7 +1184,6 @@ send_read_request(struct sftp_conn *conn, u_int id, u_int64_t offset,
 
         if ((msg = sshbuf_new()) == NULL)
                 fatal("%s: sshbuf_new failed", __func__);
-        sshbuf_reset(msg);
         if ((r = sshbuf_put_u8(msg, SSH2_FXP_READ)) != 0 ||
             (r = sshbuf_put_u32(msg, id)) != 0 ||
             (r = sshbuf_put_string(msg, handle, handle_len)) != 0 ||