From 62f534bc48c652f8b4e82ae91b41925c450bdd89 Mon Sep 17 00:00:00 2001 From: kn <> Date: Fri, 22 May 2020 13:38:44 +0000 Subject: [PATCH] Revert the following commit as it breaks hostname.if(5) lines with a backslash at the end for line continuation Breaking long lines into multiple ones must still be possible and does require to treat the backslash as an escape character. Breakage reported by Mark Patruck , thanks! --- distrib/miniroot/install.sub revision 1.1151 etc/netstart revision 1.203 date: 2020/05/21 11:54:41; author: kn; state: Exp; lines: +2 -2; 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. 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 --- src/etc/netstart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/netstart b/src/etc/netstart index 06054091..891d34e8 100644 --- a/src/etc/netstart +++ b/src/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.204 2020/05/21 13:42:02 kn Exp $ +# $OpenBSD: netstart,v 1.205 2020/05/22 13:38:44 kn Exp $ # Turn off Strict Bourne shell mode. set +o sh @@ -133,7 +133,7 @@ ifstart() { # Parse the hostname.if(5) file and fill _cmds array with interface # configuration commands. set -o noglob - while IFS= read -r -- _line; do + while IFS= read -- _line; do parse_hn_line $_line done <$_hn