diff --git a/ssh/agent/forward.go b/ssh/agent/forward.go index fd24ba900d..686ffb3ee9 100644 --- a/ssh/agent/forward.go +++ b/ssh/agent/forward.go @@ -17,14 +17,8 @@ import ( // ForwardToAgent or ForwardToRemote should be called to route // the authentication requests. func RequestAgentForwarding(session *ssh.Session) error { - ok, err := session.SendRequest("auth-agent-req@openssh.com", true, nil) - if err != nil { - return err - } - if !ok { - return errors.New("forwarding request denied") - } - return nil + _, err := session.SendRequest("auth-agent-req@openssh.com", false, nil) + return err } // ForwardToAgent routes authentication requests to the given keyring. diff --git a/ssh/session.go b/ssh/session.go index d3321f6b78..a6fdb941bd 100644 --- a/ssh/session.go +++ b/ssh/session.go @@ -169,10 +169,7 @@ func (s *Session) Setenv(name, value string) error { Name: name, Value: value, } - ok, err := s.ch.SendRequest("env", true, Marshal(&msg)) - if err == nil && !ok { - err = errors.New("ssh: setenv failed") - } + _, err := s.ch.SendRequest("env", false, Marshal(&msg)) return err } diff --git a/ssh/streamlocal.go b/ssh/streamlocal.go index b171b330bc..bde61263ed 100644 --- a/ssh/streamlocal.go +++ b/ssh/streamlocal.go @@ -100,10 +100,7 @@ func (l *unixListener) Close() error { m := streamLocalChannelForwardMsg{ l.socketPath, } - ok, _, err := l.conn.SendRequest("cancel-streamlocal-forward@openssh.com", true, Marshal(&m)) - if err == nil && !ok { - err = errors.New("ssh: cancel-streamlocal-forward@openssh.com failed") - } + _, _, err := l.conn.SendRequest("cancel-streamlocal-forward@openssh.com", false, Marshal(&m)) return err } diff --git a/ssh/tcpip.go b/ssh/tcpip.go index 80d35f5ec1..5c0ad32d67 100644 --- a/ssh/tcpip.go +++ b/ssh/tcpip.go @@ -320,10 +320,7 @@ func (l *tcpListener) Close() error { // this also closes the listener. l.conn.forwards.remove(l.laddr) - ok, _, err := l.conn.SendRequest("cancel-tcpip-forward", true, Marshal(&m)) - if err == nil && !ok { - err = errors.New("ssh: cancel-tcpip-forward failed") - } + _, _, err := l.conn.SendRequest("cancel-tcpip-forward", false, Marshal(&m)) return err }