From 7e1c55899209f4808b02c1b07237326447571a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 14 Apr 2006 08:26:10 +0000 Subject: [PATCH] - don't request pseudoterminal allocation if stdin is not tty (#188983) --- openssh-4.3p1-fromto-remote.patch | 12 ++++++++---- openssh.spec | 5 ++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/openssh-4.3p1-fromto-remote.patch b/openssh-4.3p1-fromto-remote.patch index 9313a65..ccb3d6e 100644 --- a/openssh-4.3p1-fromto-remote.patch +++ b/openssh-4.3p1-fromto-remote.patch @@ -1,11 +1,15 @@ ---- openssh-4.3p1/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 -@@ -446,7 +446,7 @@ +--- openssh-4.3p2/scp.c.fromto-remote 2006-01-31 12:11:38.000000000 +0100 ++++ openssh-4.3p2/scp.c 2006-04-14 10:09:56.000000000 +0200 +@@ -446,7 +446,11 @@ addargs(&alist, "-v"); addargs(&alist, "-x"); addargs(&alist, "-oClearAllForwardings yes"); - addargs(&alist, "-n"); -+ addargs(&alist, "-t"); ++ if (isatty(fileno(stdin))) { ++ addargs(&alist, "-t"); ++ } else { ++ addargs(&alist, "-n"); ++ } *src++ = 0; if (*src == 0) diff --git a/openssh.spec b/openssh.spec index d729c42..a6a44a7 100644 --- a/openssh.spec +++ b/openssh.spec @@ -58,7 +58,7 @@ Summary: The OpenSSH implementation of SSH protocol versions 1 and 2. Name: openssh Version: 4.3p2 -%define rel 4 +%define rel 5 %if %{rescue} %define %{rel}rescue %else @@ -454,6 +454,9 @@ fi %endif %changelog +* Fri Apr 14 2006 Tomas Mraz - 4.3p2-5 +- don't request pseudoterminal allocation if stdin is not tty (#188983) + * Thu Mar 2 2006 Tomas Mraz - 4.3p2-4 - allow access if audit is not compiled in kernel (#183243)