From 87ef7b8238a5975e65ef8e08902233a1c735901f Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 14 Jan 2015 13:33:57 +0100 Subject: [PATCH] Fix confusing error message in scp (#1142223) --- openssh-6.4p1-scp-non-existing-directory.patch | 14 ++++++++++++++ openssh.spec | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 openssh-6.4p1-scp-non-existing-directory.patch diff --git a/openssh-6.4p1-scp-non-existing-directory.patch b/openssh-6.4p1-scp-non-existing-directory.patch new file mode 100644 index 0000000..5412bc5 --- /dev/null +++ b/openssh-6.4p1-scp-non-existing-directory.patch @@ -0,0 +1,14 @@ +--- a/scp.c ++++ a/scp.c +@@ -1084,6 +1084,10 @@ sink(int argc, char **argv) + free(vect[0]); + continue; + } ++ if (buf[0] == 'C' && ! exists && np[strlen(np)-1] == '/') { ++ errno = ENOTDIR; ++ goto bad; ++ } + omode = mode; + mode |= S_IWUSR; + if ((ofd = open(np, O_WRONLY|O_CREAT, mode)) < 0) { +-- diff --git a/openssh.spec b/openssh.spec index 12cedc5..c659d46 100644 --- a/openssh.spec +++ b/openssh.spec @@ -217,6 +217,8 @@ Patch915: openssh-6.4p1-ignore-SIGXFSZ-in-postauth.patch Patch916: openssh-6.4p1-cisco-dh-keys.patch # sftp: remote directory always prepended to relative symbolic links (#825538) Patch917: openssh-6.4p1-sftp-symlink-prepend-relative-links.patch +# scp file into non-existing directory (#1142223) +Patch918: openssh-6.4p1-scp-non-existing-directory.patch License: BSD Group: Applications/Internet @@ -452,6 +454,7 @@ popd %patch915 -p1 -b .SIGXFSZ %patch916 -p1 -b .cisco-dh %patch917 -p1 -b .sftp +%patch918 -p1 -b .scp %if 0