From 96df3b5ecb3ab312fbb88543b05619763ea39ceb Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Mon, 20 Jan 2014 19:41:27 +0100
Subject: [PATCH] use tty allocation for a remote scp

---
 openssh-6.4p1-fromto-remote.patch | 16 ++++++++++++++++
 openssh.spec                      |  3 +++
 2 files changed, 19 insertions(+)
 create mode 100644 openssh-6.4p1-fromto-remote.patch

diff --git a/openssh-6.4p1-fromto-remote.patch b/openssh-6.4p1-fromto-remote.patch
new file mode 100644
index 0000000..4a7d849
--- /dev/null
+++ b/openssh-6.4p1-fromto-remote.patch
@@ -0,0 +1,16 @@
+diff --git a/scp.c b/scp.c
+index d98fa67..25d347b 100644
+--- a/scp.c
++++ b/scp.c
+@@ -638,7 +638,10 @@ toremote(char *targ, int argc, char **argv)
+ 			addargs(&alist, "%s", ssh_program);
+ 			addargs(&alist, "-x");
+ 			addargs(&alist, "-oClearAllForwardings=yes");
+-			addargs(&alist, "-n");
++			if (isatty(fileno(stdin)))
++				addargs(&alist, "-t");
++			else
++				addargs(&alist, "-n");
+ 			for (j = 0; j < remote_remote_args.num; j++) {
+ 				addargs(&alist, "%s",
+ 				    remote_remote_args.list[j]);
diff --git a/openssh.spec b/openssh.spec
index b1b9588..153d1bc 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -186,6 +186,8 @@ Patch903: openssh-6.3p1-increase-size-of-DF-groups.patch
 Patch904: openssh-6.4p1-FIPS-mode-SP800-131A.patch
 # Run ssh-copy-id in the legacy mode when SSH_COPY_ID_LEGACY variable is set (#969375
 Patch905: openssh-6.4p1-legacy-ssh-copy-id.patch
+# Use tty allocation for a remote scp (#985650)
+Patch906: openssh-6.4p1-fromto-remote.patch
 
 
 License: BSD
@@ -410,6 +412,7 @@ popd
 %patch903 -p1 -b .dh
 %patch904 -p1 -b .SP800-131A
 %patch905 -p1 -b .legacy-ssh-copy-id
+%patch906 -p1 -b .fromto-remote
 
 %if 0
 # Nothing here yet