From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 30 Oct 2023 17:32:24 +0000 (+0100)
Subject: hostapd: do not trim trailing whitespace, except for newline
X-Git-Tag: v23.05.1~52
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=eaf44c56968495ea4e500ebaa11ab1932d550bcd;p=openwrt%2Fstaging%2Fpepe2k.git

hostapd: do not trim trailing whitespace, except for newline

Fixes adding SSID or key with trailing whitespace

Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit a2d8226c4f45555f49542d6f047b70d44f23f7ec)
---

diff --git a/package/network/services/hostapd/files/hostapd.uc b/package/network/services/hostapd/files/hostapd.uc
index 88f01caa93..593840cca8 100644
--- a/package/network/services/hostapd/files/hostapd.uc
+++ b/package/network/services/hostapd/files/hostapd.uc
@@ -571,7 +571,7 @@ function iface_load_config(filename)
 
 	let bss;
 	let line;
-	while ((line = trim(f.read("line"))) != null) {
+	while ((line = rtrim(f.read("line"), "\n")) != null) {
 		let val = split(line, "=", 2);
 		if (!val[0])
 			continue;
@@ -593,7 +593,7 @@ function iface_load_config(filename)
 		push(config.radio.data, line);
 	}
 
-	while ((line = trim(f.read("line"))) != null) {
+	while ((line = rtrim(f.read("line"), "\n")) != null) {
 		if (line == "#default_macaddr")
 			bss.default_macaddr = true;