diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | sshconnect.c | 6 |
2 files changed, 12 insertions, 4 deletions
@@ -65,6 +65,14 @@ | |||
65 | - stevesk@cvs.openbsd.org 2008/10/10 05:00:12 | 65 | - stevesk@cvs.openbsd.org 2008/10/10 05:00:12 |
66 | [key.c] | 66 | [key.c] |
67 | typo in error message; ok djm@ | 67 | typo in error message; ok djm@ |
68 | - stevesk@cvs.openbsd.org 2008/10/10 16:43:27 | ||
69 | [ssh_config.5] | ||
70 | use 'Privileged ports can be forwarded only when logging in as root on | ||
71 | the remote machine.' for RemoteForward just like ssh.1 -R. | ||
72 | ok djm@ jmc@ | ||
73 | - stevesk@cvs.openbsd.org 2008/10/14 18:11:33 | ||
74 | [sshconnect.c] | ||
75 | use #define ROQUIET here; no binary change. ok dtucker@ | ||
68 | 76 | ||
69 | 20080906 | 77 | 20080906 |
70 | - (dtucker) [config.guess config.sub] Update to latest versions from | 78 | - (dtucker) [config.guess config.sub] Update to latest versions from |
@@ -4799,4 +4807,4 @@ | |||
4799 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4807 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4800 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4808 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4801 | 4809 | ||
4802 | $Id: ChangeLog,v 1.5114 2008/11/03 08:24:16 djm Exp $ | 4810 | $Id: ChangeLog,v 1.5115 2008/11/03 08:25:03 djm Exp $ |
diff --git a/sshconnect.c b/sshconnect.c index ec8ba33e0..1c4c744ec 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.211 2008/07/01 07:24:22 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.212 2008/10/14 18:11:33 stevesk 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 |
@@ -741,8 +741,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
741 | if (options.host_key_alias == NULL && port != 0 && | 741 | if (options.host_key_alias == NULL && port != 0 && |
742 | port != SSH_DEFAULT_PORT) { | 742 | port != SSH_DEFAULT_PORT) { |
743 | debug("checking without port identifier"); | 743 | debug("checking without port identifier"); |
744 | if (check_host_key(hostname, hostaddr, 0, host_key, 2, | 744 | if (check_host_key(hostname, hostaddr, 0, host_key, |
745 | user_hostfile, system_hostfile) == 0) { | 745 | ROQUIET, user_hostfile, system_hostfile) == 0) { |
746 | debug("found matching key w/out port"); | 746 | debug("found matching key w/out port"); |
747 | break; | 747 | break; |
748 | } | 748 | } |