diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-01-23 21:50:56 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2019-01-24 12:30:30 +1100 |
commit | d05ea255678d9402beda4416cd0360f3e5dfe938 (patch) | |
tree | 90ba5b611675fe92e2938c1e5b0206183c5f42e3 /misc.c | |
parent | 177d6c80c557a5e060cd343a0c116a2f1a7f43db (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.c')
-rw-r--r-- | misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.c,v 1.136 2018/12/27 03:25:25 djm Exp $ */ | 1 | /* $OpenBSD: misc.c,v 1.137 2019/01/23 21:50:56 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. |
@@ -564,7 +564,7 @@ put_host_port(const char *host, u_short port) | |||
564 | * The delimiter char, if present, is stored in delim. | 564 | * The delimiter char, if present, is stored in delim. |
565 | * If this is the last field, *cp is set to NULL. | 565 | * If this is the last field, *cp is set to NULL. |
566 | */ | 566 | */ |
567 | static char * | 567 | char * |
568 | hpdelim2(char **cp, char *delim) | 568 | hpdelim2(char **cp, char *delim) |
569 | { | 569 | { |
570 | char *s, *old; | 570 | char *s, *old; |