From ba8b73bd762032d724f84c5ef94968a7b3af6bec Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 30 May 2014 07:56:56 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

---
 interface/web/dns/form/dns_mx.tform.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/dns/form/dns_mx.tform.php b/interface/web/dns/form/dns_mx.tform.php
index 2a8ee6d..d5faeeb 100644
--- a/interface/web/dns/form/dns_mx.tform.php
+++ b/interface/web/dns/form/dns_mx.tform.php
@@ -87,7 +87,7 @@
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
+					'regex' => '/^[a-zA-Z0-9\.\-\*]{0,255}$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',

--
Gitblit v1.9.1