* New upstream release (http://www.openssh.com/txt/release-6.2p2):

  - Only warn for missing identity files that were explicitly specified
    (closes: #708275).
  - Fix bug in contributed contrib/ssh-copy-id script that could result in
    "rm *" being called on mktemp failure (closes: #708419).

1 files changed, 8 insertions, 1 deletions

diff --git a/sshconnect.c b/sshconnect.c
index ed0e78bfd..1fa1d5963 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.236 2012/09/14 16:51:34 markus Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.237 2013/02/22 19:13:56 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -89,6 +89,13 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
         pid_t pid;
         char *shell, strport[NI_MAXSERV];
 
+        if (!strcmp(proxy_command, "-")) {
+                packet_set_connection(STDIN_FILENO, STDOUT_FILENO);
+                packet_set_timeout(options.server_alive_interval,
+                    options.server_alive_count_max);
+                return 0;
+        }
+
         if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
                 shell = _PATH_BSHELL;