diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-21 17:45:06 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-21 17:45:06 -0300 |
| commit | 841e800d7def5ff6ca12b7ab5da8e7878e20e55b (patch) | |
| tree | 2f838f478c6805f4cf437c5634b2af4c6f5a3931 /src/usr | |
| parent | 66fd7b47679187ddcfaf5852a55b2af15394f341 (diff) | |
| parent | cc882a8b0cfee277ccef76f8964dd75adb481377 (diff) | |
| download | pfsense-841e800d7def5ff6ca12b7ab5da8e7878e20e55b.zip pfsense-841e800d7def5ff6ca12b7ab5da8e7878e20e55b.tar.gz | |
Merge pull request #1902 from dachande/feature/certmanager_san_wildcard_hostname
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/system_certmanager.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index ebf96df..2e10c69 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -234,13 +234,13 @@ if ($act == "csr") { } if ($_POST) { - + // This is just the blank altername name that is added for display purposes. We don't want to validate/save it if($_POST['altname_value0'] == "") { unset($_POST['altname_type0']); unset($_POST['altname_value0']); } - + if ($_POST['save'] == gettext("Save")) { $input_errors = array(); $pconfig = $_POST; @@ -323,8 +323,8 @@ if ($_POST) { foreach ($altnames as $idx => $altname) { switch ($altname['type']) { case "DNS": - if (!is_hostname($altname['value'])) { - array_push($input_errors, "DNS subjectAltName values must be valid hostnames or FQDNs"); + if (!is_hostname($altname['value'], true)) { + array_push($input_errors, "DNS subjectAltName values must be valid hostnames, FQDNs or wildcard domains."); } break; case "IP": @@ -551,7 +551,7 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); - + if ($savemsg) print_info_box($savemsg, 'success'); @@ -1263,4 +1263,4 @@ events.push(function(){ //]]> </script> <?php -include('foot.inc');
\ No newline at end of file +include('foot.inc'); |
