From df95743889d0a323dc05809964d2b969e35206d9 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 26 Oct 2015 21:00:17 -0700
Subject: [PATCH] Array option types also need to be quoted
 https://sourceforge.net/p/webadmin/bugs/4664/

---
 dhcpd/edit_options.cgi | 6 +++---
 dhcpd/save_options.cgi | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dhcpd/edit_options.cgi b/dhcpd/edit_options.cgi
index ad677490ce..1d9f3e7fd6 100755
--- a/dhcpd/edit_options.cgi
+++ b/dhcpd/edit_options.cgi
@@ -142,12 +142,12 @@ if ($config{'dhcpd_version'} >= 3) {
 		print "<tr>\n";
 		print "<td><b>$text{'eopt_def'}</b></td><td nowrap colspan=3>\n";
 		print "$text{'eopt_dname'}\n";
-        print &ui_textbox("dname_".$i, $o->{'values'}->[0], 15);
+		print &ui_textbox("dname_".$i, $o->{'values'}->[0], 15);
 		print "$text{'eopt_dnum'}\n";
-        print &ui_textbox("dnum_".$i, $o->{'values'}->[2], 4);
+		print &ui_textbox("dnum_".$i, $o->{'values'}->[2], 4);
 		print "$text{'eopt_dtype'}\n";
 		my $a=scalar(@{$o->{'values'}})-1;
-        print &ui_textbox("dtype_".$i, join(" ",@{$o->{'values'}}[4..$a]), 40);
+		print &ui_textbox("dtype_".$i, join(" ",@{$o->{'values'}}[4..$a]), 40);
 		print "</td></tr>\n";
 		}
 
diff --git a/dhcpd/save_options.cgi b/dhcpd/save_options.cgi
index 714b6de634..b62f604bef 100755
--- a/dhcpd/save_options.cgi
+++ b/dhcpd/save_options.cgi
@@ -149,6 +149,7 @@ if ($config{'dhcpd_version'} >= 3) {
 			    &error(&text('sopt_ecip', $in{"cname_$i"}));
 			}
 		if ($o && $o->{'values'}->[4] eq 'string' ||
+		    $o && $o->{'values'}->[4] eq 'array' ||
 		    $cv !~ /^([0-9a-fA-F]{1,2}:)*[0-9a-fA-F]{1,2}$/ &&
 		    !&check_ipaddress($cv)) {
 			# Quote if type is a string, or unknown and not an IP