summaryrefslogtreecommitdiff
path: root/misc.h
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-01-23 21:50:56 +0000
committerDarren Tucker <dtucker@dtucker.net>2019-01-24 12:30:30 +1100
commitd05ea255678d9402beda4416cd0360f3e5dfe938 (patch)
tree90ba5b611675fe92e2938c1e5b0206183c5f42e3 /misc.h
parent177d6c80c557a5e060cd343a0c116a2f1a7f43db (diff)
upstream: Remove support for obsolete host/port syntax.
host/port was added in 2001 as an alternative to host:port syntax for the benefit of IPv6 users. These days there are establised standards for this like [::1]:22 and the slash syntax is easily mistaken for CIDR notation, which OpenSSH now supports for some things. Remove the slash notation from ListenAddress and PermitOpen. bz#2335, patch from jjelen at redhat.com, ok markus@ OpenBSD-Commit-ID: fae5f4e23c51a368d6b2d98376069ac2b10ad4b7
Diffstat (limited to 'misc.h')
-rw-r--r--misc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/misc.h b/misc.h
index 47177d838..5b4325aba 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.78 2018/12/27 03:25:25 djm Exp $ */ 1/* $OpenBSD: misc.h,v 1.79 2019/01/23 21:50:56 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -57,6 +57,7 @@ int timeout_connect(int, const struct sockaddr *, socklen_t, int *);
57int a2port(const char *); 57int a2port(const char *);
58int a2tun(const char *, int *); 58int a2tun(const char *, int *);
59char *put_host_port(const char *, u_short); 59char *put_host_port(const char *, u_short);
60char *hpdelim2(char **, char *);
60char *hpdelim(char **); 61char *hpdelim(char **);
61char *cleanhostname(char *); 62char *cleanhostname(char *);
62char *colon(char *); 63char *colon(char *);