summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-08-12 22:11:18 +1000
committerDamien Miller <djm@mindrot.org>2005-08-12 22:11:18 +1000
commit43f6db64ff57f147ef9fb77e4dd2748a02a00fea (patch)
tree0cd5216b777ce1182fe3ebe4bcb121cf2e6e5ad5
parentbe1045dc588ff001674033bce06a65db73ad3654 (diff)
- djm@cvs.openbsd.org 2005/07/30 02:03:47
[readconf.c] listen_hosts initialisation here too; spotted greg AT y2005.nest.cx
-rw-r--r--ChangeLog5
-rw-r--r--readconf.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 835cada42..874a38fd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 [ssh.c] 7 [ssh.c]
8 fix -D listen_host initialisation, so it picks up gateway_ports setting 8 fix -D listen_host initialisation, so it picks up gateway_ports setting
9 correctly 9 correctly
10 - djm@cvs.openbsd.org 2005/07/30 02:03:47
11 [readconf.c]
12 listen_hosts initialisation here too; spotted greg AT y2005.nest.cx
10 13
1120050810 1420050810
12 - (dtucker) [configure.ac] Test libedit library and headers for compatibility. 15 - (dtucker) [configure.ac] Test libedit library and headers for compatibility.
@@ -2917,4 +2920,4 @@
2917 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2920 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2918 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2921 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2919 2922
2920$Id: ChangeLog,v 1.3867 2005/08/12 12:10:56 djm Exp $ 2923$Id: ChangeLog,v 1.3868 2005/08/12 12:11:18 djm Exp $
diff --git a/readconf.c b/readconf.c
index 1e3c13239..cf27a9f41 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: readconf.c,v 1.142 2005/07/17 07:17:55 djm Exp $"); 15RCSID("$OpenBSD: readconf.c,v 1.143 2005/07/30 02:03:47 djm Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
@@ -695,7 +695,7 @@ parse_int:
695 fwd.listen_host = cleanhostname(fwd.listen_host); 695 fwd.listen_host = cleanhostname(fwd.listen_host);
696 } else { 696 } else {
697 fwd.listen_port = a2port(fwd.listen_host); 697 fwd.listen_port = a2port(fwd.listen_host);
698 fwd.listen_host = ""; 698 fwd.listen_host = NULL;
699 } 699 }
700 if (fwd.listen_port == 0) 700 if (fwd.listen_port == 0)
701 fatal("%.200s line %d: Badly formatted port number.", 701 fatal("%.200s line %d: Badly formatted port number.",