ocserv: use better separator for sed
authorNikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Sun, 10 Sep 2023 13:48:12 +0000 (15:48 +0200)
committerNikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Mon, 19 Feb 2024 15:36:39 +0000 (16:36 +0100)
This prevents clashes with network addresses that
contain '/'.

Resolves: #18589

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
net/ocserv/files/ocserv.init

index 489ec897f4fcdf5a6e17caaee96924c3fde44f60..2cd16c08480094035033ea9d67a8dd59447fbe39 100755 (executable)
@@ -84,25 +84,25 @@ setup_config() {
        [ -n "$hostname" ] && dyndns="true"
 
        mkdir -p /var/etc
-       sed -e "s/|PORT|/$port/g" \
-           -e "s/|UDP_PORT|/$udp_port/g" \
-           -e "s/|MAX_CLIENTS|/$max_clients/g" \
-           -e "s/|MAX_SAME|/$max_same/g" \
-           -e "s/|DPD|/$dpd/g" \
+       sed -e "s#|PORT|#$port#g" \
+           -e "s#|UDP_PORT|#$udp_port#g" \
+           -e "s#|MAX_CLIENTS|#$max_clients#g" \
+           -e "s#|MAX_SAME|#$max_same#g" \
+           -e "s#|DPD|#$dpd#g" \
            -e "s#|AUTH|#$auth$authsuffix#g" \
            -e "s#|DYNDNS|#$dyndns#g" \
-           -e "s/|PREDICTABLE_IPS|/$predictable_ips/g" \
-           -e "s/|DEFAULT_DOMAIN|/$default_domain/g" \
-           -e "s/|ENABLE_DEFAULT_DOMAIN|/$enable_default_domain/g" \
-           -e "s/|ENABLE_SPLIT_DNS|/$enable_split_dns/g" \
-           -e "s/|CISCO_COMPAT|/$cisco_compat/g" \
-           -e "s/|PING_LEASES|/$ping_leases/g" \
-           -e "s/|UDP|/$enable_udp/g" \
-           -e "s/|COMPRESSION|/$enable_compression/g" \
-           -e "s/|IPV4ADDR|/$ipaddr/g" \
-           -e "s/|NETMASK|/$netmask/g" \
+           -e "s#|PREDICTABLE_IPS|#$predictable_ips#g" \
+           -e "s#|DEFAULT_DOMAIN|#$default_domain#g" \
+           -e "s#|ENABLE_DEFAULT_DOMAIN|#$enable_default_domain#g" \
+           -e "s#|ENABLE_SPLIT_DNS|#$enable_split_dns#g" \
+           -e "s#|CISCO_COMPAT|#$cisco_compat#g" \
+           -e "s#|PING_LEASES|#$ping_leases#g" \
+           -e "s#|UDP|#$enable_udp#g" \
+           -e "s#|COMPRESSION|#$enable_compression#g" \
+           -e "s#|IPV4ADDR|#$ipaddr#g" \
+           -e "s#|NETMASK|#$netmask#g" \
            -e "s#|IPV6ADDR|#$ip6addr#g" \
-           -e "s/|ENABLE_IPV6|/$enable_ipv6/g" \
+           -e "s#|ENABLE_IPV6|#$enable_ipv6#g" \
            /etc/ocserv/ocserv.conf.template > /var/etc/ocserv.conf
 
        test -f /etc/ocserv/ocserv.conf.local && cat /etc/ocserv/ocserv.conf.local >> /var/etc/ocserv.conf