From 08ded6035f61ed97e3a122dc1832703084b72f86 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 18 Mar 2019 15:35:29 +0000
Subject: [PATCH] dnsforward.cgi: Check DISABLE_DNSSEC checkbox when editing

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/core/130/filelists/files | 1 +
 html/cgi-bin/dnsforward.cgi               | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/rootfiles/core/130/filelists/files b/config/rootfiles/core/130/filelists/files
index b9649b989e..10e0184a37 100644
--- a/config/rootfiles/core/130/filelists/files
+++ b/config/rootfiles/core/130/filelists/files
@@ -9,6 +9,7 @@ etc/rc.d/init.d/networking/red.up/23-suricata
 etc/rc.d/init.d/suricata
 etc/syslog.conf
 srv/web/ipfire/cgi-bin/aliases.cgi
+srv/web/ipfire/cgi-bin/dnsforward.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/ids.dat
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi
index d9807c90e6..391905f719 100644
--- a/html/cgi-bin/dnsforward.cgi
+++ b/html/cgi-bin/dnsforward.cgi
@@ -189,7 +189,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'})
 			$cgiparams{'ZONE'} = $temp[1];
 			$cgiparams{'FORWARD_SERVERS'} = join(",", split(/\|/, $temp[2]));
 			$cgiparams{'REMARK'} = $temp[3];
-			$cgiparams{'DISABLE_DNSSEC'} = $temp[4];
+			$cgiparams{'DISABLE_DNSSEC'} = ($temp[4] eq "on") ? "on" : "off";
 		}
 	}
 }
@@ -250,7 +250,7 @@ print <<END
 	</tr>
 	<tr>
 		<td width ='20%' class='base'>$Lang::tr{'dns forward disable dnssec'}:</td>
-		<td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}' /></td>
+		<td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}{'on'} /></td>
 	</tr>
 </table>
 <br>
-- 
2.39.2