hostapd: do not trim trailing whitespace, except for newline
authorFelix Fietkau <nbd@nbd.name>
Mon, 30 Oct 2023 17:32:24 +0000 (18:32 +0100)
committerFelix Fietkau <nbd@nbd.name>
Tue, 31 Oct 2023 12:30:11 +0000 (13:30 +0100)
Fixes adding SSID or key with trailing whitespace

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

package/network/services/hostapd/files/hostapd.uc

index 88f01caa93ebfd20edae3c4d1a697123d0eb9036..593840cca88fbe45b438e5eb24ca7dd2de41c87e 100644 (file)
@@ -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;