diff options
| author | Damien Miller <djm@mindrot.org> | 2008-11-03 19:25:03 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-11-03 19:25:03 +1100 |
| commit | ece92c8c5e03b1f927d0f8a8e6b3b37919c951c1 (patch) | |
| tree | d6e23d4838bda2fca80d6d293377ce83936f2da4 | |
| parent | de7532e1d42a5af8d1766e3b693a3d0f45d11160 (diff) | |
- stevesk@cvs.openbsd.org 2008/10/14 18:11:33
[sshconnect.c]
use #define ROQUIET here; no binary change. ok dtucker@
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | sshconnect.c | 6 |
2 files changed, 12 insertions, 4 deletions
@@ -65,6 +65,14 @@ - stevesk@cvs.openbsd.org 2008/10/10 05:00:12 [key.c] typo in error message; ok djm@ + - stevesk@cvs.openbsd.org 2008/10/10 16:43:27 + [ssh_config.5] + use 'Privileged ports can be forwarded only when logging in as root on + the remote machine.' for RemoteForward just like ssh.1 -R. + ok djm@ jmc@ + - stevesk@cvs.openbsd.org 2008/10/14 18:11:33 + [sshconnect.c] + use #define ROQUIET here; no binary change. ok dtucker@ 20080906 - (dtucker) [config.guess config.sub] Update to latest versions from @@ -4799,4 +4807,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5114 2008/11/03 08:24:16 djm Exp $ +$Id: ChangeLog,v 1.5115 2008/11/03 08:25:03 djm Exp $ diff --git a/sshconnect.c b/sshconnect.c index ec8ba33e..1c4c744e 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.211 2008/07/01 07:24:22 dtucker Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.212 2008/10/14 18:11:33 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * 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, if (options.host_key_alias == NULL && port != 0 && port != SSH_DEFAULT_PORT) { debug("checking without port identifier"); - if (check_host_key(hostname, hostaddr, 0, host_key, 2, - user_hostfile, system_hostfile) == 0) { + if (check_host_key(hostname, hostaddr, 0, host_key, + ROQUIET, user_hostfile, system_hostfile) == 0) { debug("found matching key w/out port"); break; } |