summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorkn <kn@cvs.openbsd.org>2020-05-21 11:54:42 +0000
committerkn <kn@cvs.openbsd.org>2020-05-21 11:54:42 +0000
commit9077b8d5605597d870ae898fe4c4d22e52f154a3 (patch)
tree3442fd4b3e934a5a1e4bc448014f978574b73f3e /etc
parent6b27eea5b33923efe974e620a82abbf1619eb966 (diff)
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 'etc')
-rw-r--r--etc/netstart4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/netstart b/etc/netstart
index 6726853d135..ad5d7d215af 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.202 2020/01/15 00:19:40 kn Exp $
+# $OpenBSD: netstart,v 1.203 2020/05/21 11:54:41 kn Exp $
# Turn off Strict Bourne shell mode.
set +o sh
@@ -134,7 +134,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