diff options
author | Kevin Steves <stevesk@pobox.com> | 2001-02-05 12:42:17 +0000 |
---|---|---|
committer | Kevin Steves <stevesk@pobox.com> | 2001-02-05 12:42:17 +0000 |
commit | ef4eea9badfb65f05ac24f786b710cc3f27f0e43 (patch) | |
tree | f54abef181ccd6ad5285a5c16b4c159d8b74e932 /sshconnect.c | |
parent | d2ddda4efab29fd8663757634773fa10e557e0f3 (diff) |
- stevesk@cvs.openbsd.org 2001/02/04 08:32:27
[many files; did this manually to our top-level source dir]
unexpand and remove end-of-line whitespace; ok markus@
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c index 2a2aa98e7..a10a689df 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -328,7 +328,7 @@ ssh_exchange_identification() | |||
328 | int remote_major, remote_minor, i, mismatch; | 328 | int remote_major, remote_minor, i, mismatch; |
329 | int connection_in = packet_get_connection_in(); | 329 | int connection_in = packet_get_connection_in(); |
330 | int connection_out = packet_get_connection_out(); | 330 | int connection_out = packet_get_connection_out(); |
331 | int minor1 = PROTOCOL_MINOR_1; | 331 | int minor1 = PROTOCOL_MINOR_1; |
332 | 332 | ||
333 | /* Read other side\'s version identification. */ | 333 | /* Read other side\'s version identification. */ |
334 | for (;;) { | 334 | for (;;) { |
@@ -688,7 +688,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
688 | error("X11 forwarding is disabled to avoid trojan horses."); | 688 | error("X11 forwarding is disabled to avoid trojan horses."); |
689 | options.forward_x11 = 0; | 689 | options.forward_x11 = 0; |
690 | } | 690 | } |
691 | if (options.num_local_forwards > 0 || options.num_remote_forwards > 0) { | 691 | if (options.num_local_forwards > 0 || options.num_remote_forwards > 0) { |
692 | error("Port forwarding is disabled to avoid trojan horses."); | 692 | error("Port forwarding is disabled to avoid trojan horses."); |
693 | options.num_local_forwards = options.num_remote_forwards = 0; | 693 | options.num_local_forwards = options.num_remote_forwards = 0; |
694 | } | 694 | } |