summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-11-05 15:12:59 +1100
committerDamien Miller <djm@mindrot.org>2005-11-05 15:12:59 +1100
commitaa3bb1094011e640488e9f2ebd718a79960b147d (patch)
treed43d7942176629b0b5da9350651263d561a8ccfe
parent4bbacb706b36e35f341d41a25ee0cfa6b37af047 (diff)
- djm@cvs.openbsd.org 2005/10/30 04:03:24
[ssh.c] fix misleading debug message; ok dtucker@
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2aad22f7a..112f5728f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,9 @@
62 [ssh-keyscan.c] 62 [ssh-keyscan.c]
63 make ssh-keygen discard junk from server before SSH- ident, spotted by 63 make ssh-keygen discard junk from server before SSH- ident, spotted by
64 dave AT cirt.net; ok dtucker@ 64 dave AT cirt.net; ok dtucker@
65 - djm@cvs.openbsd.org 2005/10/30 04:03:24
66 [ssh.c]
67 fix misleading debug message; ok dtucker@
65 68
6620051102 6920051102
67 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). 70 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@@ -3195,4 +3198,4 @@
3195 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3198 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3196 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3199 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3197 3200
3198$Id: ChangeLog,v 1.3941 2005/11/05 04:12:28 djm Exp $ 3201$Id: ChangeLog,v 1.3942 2005/11/05 04:12:59 djm Exp $
diff --git a/ssh.c b/ssh.c
index e51ead726..7e8bc1f24 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.252 2005/10/14 02:17:59 stevesk Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.253 2005/10/30 04:03:24 djm Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -794,8 +794,7 @@ ssh_init_forwarding(void)
794 debug("Remote connections from %.200s:%d forwarded to " 794 debug("Remote connections from %.200s:%d forwarded to "
795 "local address %.200s:%d", 795 "local address %.200s:%d",
796 (options.remote_forwards[i].listen_host == NULL) ? 796 (options.remote_forwards[i].listen_host == NULL) ?
797 (options.gateway_ports ? "*" : "LOCALHOST") : 797 "LOCALHOST" : options.remote_forwards[i].listen_host,
798 options.remote_forwards[i].listen_host,
799 options.remote_forwards[i].listen_port, 798 options.remote_forwards[i].listen_port,
800 options.remote_forwards[i].connect_host, 799 options.remote_forwards[i].connect_host,
801 options.remote_forwards[i].connect_port); 800 options.remote_forwards[i].connect_port);