- don't request pseudoterminal allocation if stdin is not tty (#188983)

This commit is contained in:
Tomáš Mráz 2006-04-14 08:26:10 +00:00
parent 5f29aca399
commit 7e1c558992
2 changed files with 12 additions and 5 deletions

View File

@ -1,11 +1,15 @@
--- openssh-4.3p1/scp.c.fromto-remote 2006-01-31 12:11:38.000000000 +0100 --- openssh-4.3p2/scp.c.fromto-remote 2006-01-31 12:11:38.000000000 +0100
+++ openssh-4.3p1/scp.c 2006-02-01 16:59:46.000000000 +0100 +++ openssh-4.3p2/scp.c 2006-04-14 10:09:56.000000000 +0200
@@ -446,7 +446,7 @@ @@ -446,7 +446,11 @@
addargs(&alist, "-v"); addargs(&alist, "-v");
addargs(&alist, "-x"); addargs(&alist, "-x");
addargs(&alist, "-oClearAllForwardings yes"); addargs(&alist, "-oClearAllForwardings yes");
- addargs(&alist, "-n"); - addargs(&alist, "-n");
+ addargs(&alist, "-t"); + if (isatty(fileno(stdin))) {
+ addargs(&alist, "-t");
+ } else {
+ addargs(&alist, "-n");
+ }
*src++ = 0; *src++ = 0;
if (*src == 0) if (*src == 0)

View File

@ -58,7 +58,7 @@
Summary: The OpenSSH implementation of SSH protocol versions 1 and 2. Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
Name: openssh Name: openssh
Version: 4.3p2 Version: 4.3p2
%define rel 4 %define rel 5
%if %{rescue} %if %{rescue}
%define %{rel}rescue %define %{rel}rescue
%else %else
@ -454,6 +454,9 @@ fi
%endif %endif
%changelog %changelog
* Fri Apr 14 2006 Tomas Mraz <tmraz@redhat.com> - 4.3p2-5
- don't request pseudoterminal allocation if stdin is not tty (#188983)
* Thu Mar 2 2006 Tomas Mraz <tmraz@redhat.com> - 4.3p2-4 * Thu Mar 2 2006 Tomas Mraz <tmraz@redhat.com> - 4.3p2-4
- allow access if audit is not compiled in kernel (#183243) - allow access if audit is not compiled in kernel (#183243)