From ac67e366116976211063adee3f689bc483fff088 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 30 Nov 2016 23:39:32 +0000
Subject: [PATCH] Catch more sysctl comment patterns

---
 src/freedombone-utils-firewall | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/freedombone-utils-firewall b/src/freedombone-utils-firewall
index 03f18033..62e82491 100755
--- a/src/freedombone-utils-firewall
+++ b/src/freedombone-utils-firewall
@@ -163,30 +163,35 @@ function configure_internet_protocol {
     if ! grep -q "net.ipv4.conf.default.send_redirects" /etc/sysctl.conf; then
         echo "net.ipv4.conf.default.send_redirects = 0" >> /etc/sysctl.conf
     else
+        sed -i "s|# net.ipv4.conf.default.send_redirects.*|net.ipv4.conf.default.send_redirects = 0|g" /etc/sysctl.conf
         sed -i "s|#net.ipv4.conf.default.send_redirects.*|net.ipv4.conf.default.send_redirects = 0|g" /etc/sysctl.conf
         sed -i "s|net.ipv4.conf.default.send_redirects.*|net.ipv4.conf.default.send_redirects = 0|g" /etc/sysctl.conf
     fi
     if ! grep -q "net.ipv4.conf.all.secure_redirects" /etc/sysctl.conf; then
         echo "net.ipv4.conf.all.secure_redirects = 0" >> /etc/sysctl.conf
     else
+        sed -i "s|# net.ipv4.conf.all.secure_redirects.*|net.ipv4.conf.all.secure_redirects = 0|g" /etc/sysctl.conf
         sed -i "s|#net.ipv4.conf.all.secure_redirects.*|net.ipv4.conf.all.secure_redirects = 0|g" /etc/sysctl.conf
         sed -i "s|net.ipv4.conf.all.secure_redirects.*|net.ipv4.conf.all.secure_redirects = 0|g" /etc/sysctl.conf
     fi
     if ! grep -q "net.ipv4.conf.default.accept_source_route" /etc/sysctl.conf; then
         echo "net.ipv4.conf.default.accept_source_route = 0" >> /etc/sysctl.conf
     else
+        sed -i "s|# net.ipv4.conf.default.accept_source_route.*|net.ipv4.conf.default.accept_source_route = 0|g" /etc/sysctl.conf
         sed -i "s|#net.ipv4.conf.default.accept_source_route.*|net.ipv4.conf.default.accept_source_route = 0|g" /etc/sysctl.conf
         sed -i "s|net.ipv4.conf.default.accept_source_route.*|net.ipv4.conf.default.accept_source_route = 0|g" /etc/sysctl.conf
     fi
     if ! grep -q "net.ipv4.conf.default.secure_redirects" /etc/sysctl.conf; then
         echo "net.ipv4.conf.default.secure_redirects = 0" >> /etc/sysctl.conf
     else
+        sed -i "s|# net.ipv4.conf.default.secure_redirects.*|net.ipv4.conf.default.secure_redirects = 0|g" /etc/sysctl.conf
         sed -i "s|#net.ipv4.conf.default.secure_redirects.*|net.ipv4.conf.default.secure_redirects = 0|g" /etc/sysctl.conf
         sed -i "s|net.ipv4.conf.default.secure_redirects.*|net.ipv4.conf.default.secure_redirects = 0|g" /etc/sysctl.conf
     fi
     if ! grep -q "net.ipv4.conf.default.accept_redirects" /etc/sysctl.conf; then
         echo "net.ipv4.conf.default.accept_redirects = 0" >> /etc/sysctl.conf
     else
+        sed -i "s|# net.ipv4.conf.default.accept_redirects.*|net.ipv4.conf.default.accept_redirects = 0|g" /etc/sysctl.conf
         sed -i "s|#net.ipv4.conf.default.accept_redirects.*|net.ipv4.conf.default.accept_redirects = 0|g" /etc/sysctl.conf
         sed -i "s|net.ipv4.conf.default.accept_redirects.*|net.ipv4.conf.default.accept_redirects = 0|g" /etc/sysctl.conf
     fi