summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-10-15 12:14:49 +1100
committerDamien Miller <djm@mindrot.org>2013-10-15 12:14:49 +1100
commit386feab0c4736b054585ee8ee372865d5cde8d69 (patch)
tree7ff9c9b2d5ed5cda196b533666449b6da4181369
parente9fc72edd6c313b670558cd5219601c38a949b67 (diff)
- djm@cvs.openbsd.org 2013/10/14 23:31:01
[ssh.c] whitespace at EOL; pointed out by markus@
-rw-r--r--ChangeLog3
-rw-r--r--ssh.c8
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 @@
46 add a lowercase() function and use it instead of explicit tolower() in 46 add a lowercase() function and use it instead of explicit tolower() in
47 loops 47 loops
48 part of a larger diff that was ok markus@ 48 part of a larger diff that was ok markus@
49 - djm@cvs.openbsd.org 2013/10/14 23:31:01
50 [ssh.c]
51 whitespace at EOL; pointed out by markus@
49 52
5020131010 5320131010
51 - (dtucker) OpenBSD CVS Sync 54 - (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 @@
1/* $OpenBSD: ssh.c,v 1.383 2013/10/14 23:28:23 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.384 2013/10/14 23:31:01 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -807,7 +807,7 @@ main(int ac, char **av)
807 /* Open a connection to the remote host. */ 807 /* Open a connection to the remote host. */
808 if (ssh_connect(host, &hostaddr, options.port, 808 if (ssh_connect(host, &hostaddr, options.port,
809 options.address_family, options.connection_attempts, &timeout_ms, 809 options.address_family, options.connection_attempts, &timeout_ms,
810 options.tcp_keep_alive, 810 options.tcp_keep_alive,
811#ifdef HAVE_CYGWIN 811#ifdef HAVE_CYGWIN
812 options.use_privileged_port, 812 options.use_privileged_port,
813#else 813#else
@@ -1079,7 +1079,7 @@ ssh_init_stdio_forwarding(void)
1079 1079
1080 if (stdio_forward_host == NULL) 1080 if (stdio_forward_host == NULL)
1081 return; 1081 return;
1082 if (!compat20) 1082 if (!compat20)
1083 fatal("stdio forwarding require Protocol 2"); 1083 fatal("stdio forwarding require Protocol 2");
1084 1084
1085 debug3("%s: %s:%d", __func__, stdio_forward_host, stdio_forward_port); 1085 debug3("%s: %s:%d", __func__, stdio_forward_host, stdio_forward_port);
@@ -1251,7 +1251,7 @@ ssh_session(void)
1251 char *proto, *data; 1251 char *proto, *data;
1252 /* Get reasonable local authentication information. */ 1252 /* Get reasonable local authentication information. */
1253 client_x11_get_proto(display, options.xauth_location, 1253 client_x11_get_proto(display, options.xauth_location,
1254 options.forward_x11_trusted, 1254 options.forward_x11_trusted,
1255 options.forward_x11_timeout, 1255 options.forward_x11_timeout,
1256 &proto, &data); 1256 &proto, &data);
1257 /* Request forwarding with authentication spoofing. */ 1257 /* Request forwarding with authentication spoofing. */