From 386feab0c4736b054585ee8ee372865d5cde8d69 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 15 Oct 2013 12:14:49 +1100 Subject: - djm@cvs.openbsd.org 2013/10/14 23:31:01 [ssh.c] whitespace at EOL; pointed out by markus@ --- ChangeLog | 3 +++ ssh.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91a6b6497..37493faf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,9 @@ add a lowercase() function and use it instead of explicit tolower() in loops part of a larger diff that was ok markus@ + - djm@cvs.openbsd.org 2013/10/14 23:31:01 + [ssh.c] + whitespace at EOL; pointed out by markus@ 20131010 - (dtucker) OpenBSD CVS Sync diff --git a/ssh.c b/ssh.c index 5aa5dcc89..8dfc9bc1e 100644 --- a/ssh.c +++ b/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.383 2013/10/14 23:28:23 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.384 2013/10/14 23:31:01 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -807,7 +807,7 @@ main(int ac, char **av) /* Open a connection to the remote host. */ if (ssh_connect(host, &hostaddr, options.port, options.address_family, options.connection_attempts, &timeout_ms, - options.tcp_keep_alive, + options.tcp_keep_alive, #ifdef HAVE_CYGWIN options.use_privileged_port, #else @@ -1079,7 +1079,7 @@ ssh_init_stdio_forwarding(void) if (stdio_forward_host == NULL) return; - if (!compat20) + if (!compat20) fatal("stdio forwarding require Protocol 2"); debug3("%s: %s:%d", __func__, stdio_forward_host, stdio_forward_port); @@ -1251,7 +1251,7 @@ ssh_session(void) char *proto, *data; /* Get reasonable local authentication information. */ client_x11_get_proto(display, options.xauth_location, - options.forward_x11_trusted, + options.forward_x11_trusted, options.forward_x11_timeout, &proto, &data); /* Request forwarding with authentication spoofing. */ -- cgit v1.2.3