summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--servconf.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 874a38fd7..42c6f368e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
10 - djm@cvs.openbsd.org 2005/07/30 02:03:47 10 - djm@cvs.openbsd.org 2005/07/30 02:03:47
11 [readconf.c] 11 [readconf.c]
12 listen_hosts initialisation here too; spotted greg AT y2005.nest.cx 12 listen_hosts initialisation here too; spotted greg AT y2005.nest.cx
13 - dtucker@cvs.openbsd.org 2005/08/06 10:03:12
14 [servconf.c]
15 Unbreak sshd ListenAddress for bare IPv6 addresses.
13 16
1420050810 1720050810
15 - (dtucker) [configure.ac] Test libedit library and headers for compatibility. 18 - (dtucker) [configure.ac] Test libedit library and headers for compatibility.
@@ -2920,4 +2923,4 @@
2920 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2923 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2921 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2924 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2922 2925
2923$Id: ChangeLog,v 1.3868 2005/08/12 12:11:18 djm Exp $ 2926$Id: ChangeLog,v 1.3869 2005/08/12 12:11:37 djm Exp $
diff --git a/servconf.c b/servconf.c
index 7ef7b234e..9e420a527 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.143 2005/07/25 11:59:40 markus Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.144 2005/08/06 10:03:12 dtucker Exp $");
14 14
15#include "ssh.h" 15#include "ssh.h"
16#include "log.h" 16#include "log.h"
@@ -517,6 +517,12 @@ parse_time:
517 if (arg == NULL || *arg == '\0') 517 if (arg == NULL || *arg == '\0')
518 fatal("%s line %d: missing address", 518 fatal("%s line %d: missing address",
519 filename, linenum); 519 filename, linenum);
520 /* check for bare IPv6 address: no "[]" and 2 or more ":" */
521 if (strchr(arg, '[') == NULL && (p = strchr(arg, ':')) != NULL
522 && strchr(p+1, ':') != NULL) {
523 add_listen_addr(options, arg, 0);
524 break;
525 }
520 p = hpdelim(&arg); 526 p = hpdelim(&arg);
521 if (p == NULL) 527 if (p == NULL)
522 fatal("%s line %d: bad address:port usage", 528 fatal("%s line %d: bad address:port usage",