metalefty/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

Fix confusing error message in scp (#1142223)

Browse Source
This commit is contained in:
Jakub Jelen 2015-01-14 13:33:57 +01:00 committed by Petr Lautrbach
parent 62986c5e87
commit fd06d69c6a
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openssh-6.6.1p1-scp-non-existing-directory.patch Normal file
View File

@ -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) {
--

3
openssh.spec
View File

@ -216,6 +216,8 @@ Patch916: openssh-6.6.1p1-selinux-contexts.patch
Patch917: openssh-6.6.1p1-cisco-dh-keys.patch Patch917: openssh-6.6.1p1-cisco-dh-keys.patch
# log via monitor in chroots without /dev/log # log via monitor in chroots without /dev/log
Patch918: openssh-6.6.1p1-log-in-chroot.patch Patch918: openssh-6.6.1p1-log-in-chroot.patch
# scp file into non-existing directory (#1142223)
Patch919: openssh-6.6.1p1-scp-non-existing-directory.patch
License: BSD License: BSD
Group: Applications/Internet Group: Applications/Internet
@ -427,6 +429,7 @@ popd
%patch916 -p1 -b .contexts %patch916 -p1 -b .contexts
%patch917 -p1 -b .cisco-dh %patch917 -p1 -b .cisco-dh
%patch918 -p1 -b .log-in-chroot %patch918 -p1 -b .log-in-chroot
%patch919 -p1 -b .scp
%patch200 -p1 -b .audit %patch200 -p1 -b .audit
%patch201 -p1 -b .audit-fps %patch201 -p1 -b .audit-fps