From 38e6079688c1164c32c5df2bfa1ec5921bb0163b Mon Sep 17 00:00:00 2001
From: kayrus <kay.diam@gmail.com>
Date: Fri, 11 Mar 2016 17:49:24 +0100
Subject: [PATCH] fleetctl: fixed broken ssh terminal #1499

---
 ssh/ssh.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ssh/ssh.go b/ssh/ssh.go
index ca02dd949..fa8c34928 100644
--- a/ssh/ssh.go
+++ b/ssh/ssh.go
@@ -66,10 +66,6 @@ func makeSession(client *SSHForwardingClient) (session *gossh.Session, finalize
 		return
 	}
 
-	session.Stdout = os.Stdout
-	session.Stderr = os.Stderr
-	session.Stdin = os.Stdin
-
 	modes := gossh.TerminalModes{
 		gossh.ECHO:          1,     // enable echoing
 		gossh.TTY_OP_ISPEED: 14400, // input speed = 14.4kbaud
@@ -116,6 +112,9 @@ func Execute(client *SSHForwardingClient, cmd string) (error, int) {
 		return err, -1
 	}
 
+	session.Stdout = os.Stdout
+	session.Stderr = os.Stderr
+
 	defer finalize()
 
 	session.Start(cmd)
@@ -142,6 +141,10 @@ func Shell(client *SSHForwardingClient) error {
 		return err
 	}
 
+	session.Stdout = os.Stdout
+	session.Stderr = os.Stderr
+	session.Stdin = os.Stdin
+
 	defer finalize()
 
 	if err = session.Shell(); err != nil {