- stevesk@cvs.openbsd.org 2008/10/14 18:11:33

     [sshconnect.c]
     use #define ROQUIET here; no binary change. ok dtucker@

diff --git a/ChangeLog b/ChangeLog
index 89d90ea44dfa70ad67be8fbb53c4a7f0dd77a726..fdb60659efe6e07d0fb000a3027ccbce9ddcea0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/sshconnect.c b/sshconnect.c
index ec8ba33e01674ea93d7b1cc14a9beb0e81621f78..1c4c744ec18662988d830c88c56c930b6828534d 100644 (file)
--- 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;
                        }