diff options
| author |   kn <kn@openbsd.org> | 2020-05-21 11:54:41 +0000 |
|---|---|---|
| committer | kn <kn@openbsd.org> | 2020-05-21 11:54:41 +0000 |
| commit | 2bf3771424523fcc16d904ff615b6e4d10a373a5 (patch) | |
| tree | 5bb4062dd5a362e7880d670d4696879d8ace7288 /distrib | |
| parent | hook tlsfuzzer to regress (diff) | |
| download | wireguard-openbsd-2bf3771424523fcc16d904ff615b6e4d10a373a5.tar.xz wireguard-openbsd-2bf3771424523fcc16d904ff615b6e4d10a373a5.zip | |
Do not treat backslashe as an escape character in hostname.if(5) lines
ifstart() should always pass such lines unaltered, especially if they
contain "nwid" or "description" lines with arbitrary strings.
<bsdlisten at gmail dot com> reported SSIDs such as "Mike's" during
installation end as broken; this was because the installer escaped
the single quote using backslashes which ended up being treated as
escape characters much later during hostname.if parsing in netstart(8).
Ok deraadt
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 9a590d22c2d..18b0a35c20b 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1150 2020/04/05 15:15:42 krw Exp $ +# $OpenBSD: install.sub,v 1.1151 2020/05/21 11:54:41 kn Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2377,7 +2377,7 @@ ifstart() { # Parse the hostname.if(5) file and fill _cmds array with interface # configuration commands. set -o noglob - while IFS= read -- _line; do + while IFS= read -r -- _line; do parse_hn_line $_line done <$_hn |