rpms/openssh/devel openssh-4.3p1-fromto-remote.patch, 1.1, 1.2 openssh.spec, 1.90, 1.91

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18790

Modified Files:
	openssh-4.3p1-fromto-remote.patch openssh.spec 
Log Message:
* Fri Apr 14 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-5
- don't request pseudoterminal allocation if stdin is not tty (#188983)


openssh-4.3p1-fromto-remote.patch:
 scp.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: openssh-4.3p1-fromto-remote.patch
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh-4.3p1-fromto-remote.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssh-4.3p1-fromto-remote.patch	1 Feb 2006 16:19:54 -0000	1.1
+++ openssh-4.3p1-fromto-remote.patch	14 Apr 2006 08:26:10 -0000	1.2
@@ -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)


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- openssh.spec	2 Mar 2006 21:37:28 -0000	1.90
+++ openssh.spec	14 Apr 2006 08:26:10 -0000	1.91
@@ -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 @@
 %endif
 
 %changelog
+* Fri Apr 14 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-5
+- don't request pseudoterminal allocation if stdin is not tty (#188983)
+
 * Thu Mar  2 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-4
 - allow access if audit is not compiled in kernel (#183243)