summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 711621873..835cada42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
3 - markus@cvs.openbsd.org 2005/07/28 17:36:22 3 - markus@cvs.openbsd.org 2005/07/28 17:36:22
4 [packet.c] 4 [packet.c]
5 missing packet_init_compression(); from solar 5 missing packet_init_compression(); from solar
6 - djm@cvs.openbsd.org 2005/07/30 01:26:16
7 [ssh.c]
8 fix -D listen_host initialisation, so it picks up gateway_ports setting
9 correctly
6 10
720050810 1120050810
8 - (dtucker) [configure.ac] Test libedit library and headers for compatibility. 12 - (dtucker) [configure.ac] Test libedit library and headers for compatibility.
@@ -2913,4 +2917,4 @@
2913 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2917 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2914 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2918 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2915 2919
2916$Id: ChangeLog,v 1.3866 2005/08/12 12:10:28 djm Exp $ 2920$Id: ChangeLog,v 1.3867 2005/08/12 12:10:56 djm Exp $
diff --git a/ssh.c b/ssh.c
index cabc538e3..c9e5aac7a 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.248 2005/07/16 01:35:24 djm Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.249 2005/07/30 01:26:16 djm Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -439,7 +439,7 @@ again:
439 fwd.listen_host = cleanhostname(fwd.listen_host); 439 fwd.listen_host = cleanhostname(fwd.listen_host);
440 } else { 440 } else {
441 fwd.listen_port = a2port(fwd.listen_host); 441 fwd.listen_port = a2port(fwd.listen_host);
442 fwd.listen_host = ""; 442 fwd.listen_host = NULL;
443 } 443 }
444 444
445 if (fwd.listen_port == 0) { 445 if (fwd.listen_port == 0) {