From 0ca5b18938ebf60fdfc67fd805a2f7231fcbcb59 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 26 Oct 2016 21:44:03 -0700
Subject: [PATCH] Disallow colon in default value
 https://sourceforge.net/p/webadmin/bugs/4839/

---
 custom/custom-lib.pl | 1 +
 custom/lang/en       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/custom/custom-lib.pl b/custom/custom-lib.pl
index 1c8ad0629..c93199601 100755
--- a/custom/custom-lib.pl
+++ b/custom/custom-lib.pl
@@ -377,6 +377,7 @@ for($i=0; defined($name = $in{"name_$i"}); $i++) {
 			$in{"opts_$i"} =~ /\|$/ || -r $in{"opts_$i"} ||
 				&error(&text('save_eopts', $i+1));
 			}
+		$in{"opts_$i"} =~ /:/ && &error(&text('save_eopts2', $i+1));
 		push(@{$cmd->{'args'}}, { 'name' => $name,
 					  'desc' => $in{"desc_$i"},
 					  'type' => $in{"type_$i"},
diff --git a/custom/lang/en b/custom/lang/en
index edcbb9b54..1a80e9224 100644
--- a/custom/lang/en
+++ b/custom/lang/en
@@ -78,6 +78,7 @@ save_etimeout=Missing or invalid maximum time to wait
 save_eusermin=Commands that run on other servers cannot be run from Usermin
 save_eformat=Invalid output MIME type
 save_eopts=Missing options file for parameter $1
+save_eopts2=Options file or default value for parameter $1 cannot contain :
 
 run_err=Failed to execute command
 run_ecannot=You are not allowed to run this command