* New upstream release (http://www.openssh.org/txt/release-5.7):

  - Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
    and host/user keys (ECDSA) as specified by RFC5656.  ECDH and ECDSA
    offer better performance than plain DH and DSA at the same equivalent
    symmetric key length, as well as much shorter keys.
  - sftp(1)/sftp-server(8): add a protocol extension to support a hard
    link operation.  It is available through the "ln" command in the
    client.  The old "ln" behaviour of creating a symlink is available
    using its "-s" option or through the preexisting "symlink" command.
  - scp(1): Add a new -3 option to scp: Copies between two remote hosts
    are transferred through the local host (closes: #508613).
  - ssh(1): "atomically" create the listening mux socket by binding it on
    a temporary name and then linking it into position after listen() has
    succeeded.  This allows the mux clients to determine that the server
    socket is either ready or stale without races (closes: #454784).
    Stale server sockets are now automatically removed (closes: #523250).
  - ssh(1): install a SIGCHLD handler to reap expired child process
    (closes: #594687).
  - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
    temporary directories (closes: #357469, although only if you arrange
    for ssh-agent to actually see $TMPDIR since the setgid bit will cause
    it to be stripped off).

1 files changed, 21 insertions, 19 deletions

diff --git a/clientloop.c b/clientloop.c
index 337f47c09..97032e6a8 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.222 2010/07/19 09:15:12 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.231 2011/01/16 12:05:59 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -329,7 +329,7 @@ client_x11_get_proto(const char *display, const char *xauth_path,
                 if (trusted == 0) {
                         xauthdir = xmalloc(MAXPATHLEN);
                         xauthfile = xmalloc(MAXPATHLEN);
-                        strlcpy(xauthdir, "/tmp/ssh-XXXXXXXXXX", MAXPATHLEN);
+                        mktemp_proto(xauthdir, MAXPATHLEN);
                         if (mkdtemp(xauthdir) != NULL) {
                                 do_unlink = 1;
                                 snprintf(xauthfile, MAXPATHLEN, "%s/xauthfile",
@@ -549,7 +549,7 @@ server_alive_check(void)
 {
         if (compat20) {
                 if (packet_inc_alive_timeouts() > options.server_alive_count_max) {
-                        logit("Timeout, server not responding.");
+                        logit("Timeout, server %s not responding.", host);
                         cleanup_exit(255);
                 }
                 packet_start(SSH2_MSG_GLOBAL_REQUEST);
@@ -1610,25 +1610,23 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
         }
 
         /* Output any buffered data for stdout. */
-        while (buffer_len(&stdout_buffer) > 0) {
-                len = write(fileno(stdout), buffer_ptr(&stdout_buffer),
-                    buffer_len(&stdout_buffer));
-                if (len <= 0) {
+        if (buffer_len(&stdout_buffer) > 0) {
+                len = atomicio(vwrite, fileno(stdout),
+                    buffer_ptr(&stdout_buffer), buffer_len(&stdout_buffer));
+                if (len < 0 || (u_int)len != buffer_len(&stdout_buffer))
                         error("Write failed flushing stdout buffer.");
-                        break;
-                }
-                buffer_consume(&stdout_buffer, len);
+                else
+                        buffer_consume(&stdout_buffer, len);
         }
 
         /* Output any buffered data for stderr. */
-        while (buffer_len(&stderr_buffer) > 0) {
-                len = write(fileno(stderr), buffer_ptr(&stderr_buffer),
-                    buffer_len(&stderr_buffer));
-                if (len <= 0) {
+        if (buffer_len(&stderr_buffer) > 0) {
+                len = atomicio(vwrite, fileno(stderr),
+                    buffer_ptr(&stderr_buffer), buffer_len(&stderr_buffer));
+                if (len < 0 || (u_int)len != buffer_len(&stderr_buffer))
                         error("Write failed flushing stderr buffer.");
-                        break;
-                }
-                buffer_consume(&stderr_buffer, len);
+                else
+                        buffer_consume(&stderr_buffer, len);
         }
 
         /* Clear and free any buffers. */
@@ -1642,7 +1640,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
         packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes);
         packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes);
         verbose("Transferred: sent %llu, received %llu bytes, in %.1f seconds",
-            obytes, ibytes, total_time);
+            (unsigned long long)obytes, (unsigned long long)ibytes, total_time);
         if (total_time > 0)
                 verbose("Bytes per second: sent %.1f, received %.1f",
                     obytes / total_time, ibytes / total_time);
@@ -1953,7 +1951,7 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt)
                 }
                 packet_check_eom();
         }
-        if (reply) {
+        if (reply && c != NULL) {
                 packet_start(success ?
                     SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE);
                 packet_put_int(c->remote_id);
@@ -1993,6 +1991,9 @@ client_session2_setup(int id, int want_tty, int want_subsystem,
         if ((c = channel_lookup(id)) == NULL)
                 fatal("client_session2_setup: channel %d: unknown channel", id);
 
+        packet_set_interactive(want_tty,
+            options.ip_qos_interactive, options.ip_qos_bulk);
+
         if (want_tty) {
                 struct winsize ws;
 
@@ -2149,5 +2150,6 @@ cleanup_exit(int i)
         leave_non_blocking();
         if (options.control_path != NULL && muxserver_sock != -1)
                 unlink(options.control_path);
+        ssh_kill_proxy_command();
         _exit(i);
 }