From 0edcccc3982f37dd9447cdbd57bb9a2969776277 Mon Sep 17 00:00:00 2001
From: Daniel Seebald <d.seebald@reizwerk.com>
Date: Thu, 17 Sep 2015 10:13:03 +0200
Subject: Added the possibility to use wildcard hostnames in certificate
 manager SAN fields

---
 src/usr/local/www/system_certmanager.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/usr/local')

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');
-- 
cgit v1.1