From ce1d144b7f4961d9a3daa2289f455dbedc05ee20 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 26 Apr 2018 11:13:57 +0200
Subject: [PATCH] mail/postfix: merge version 1.2 from master

---
 mail/postfix/Makefile                                       | 2 +-
 .../opnsense/mvc/app/models/OPNsense/Postfix/General.xml    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 1fdb226dc..443b79cf3 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		postfix
-PLUGIN_VERSION=		1.1
+PLUGIN_VERSION=		1.2
 PLUGIN_COMMENT=		SMTP mail relay
 PLUGIN_DEPENDS=		postfix-sasl
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml
index ef3ec6dbd..4cc93b3db 100644
--- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml
+++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/postfix/general</mount>
     <description>Postfix configuration</description>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -60,8 +60,10 @@
                 <encrypt>encrypt</encrypt>
             </OptionValues>
         </smtpclient_security>
-        <relayhost type="HostnameField">
+        <relayhost type="TextField">
             <Required>N</Required>
+            <mask>/^([0-9a-zA-Z.:\-\[\]]){1,64}$/u</mask>
+            <ValidationMessage>Only 64 of the following characters are allowed: 0-9a-zA-Z.:-[]</ValidationMessage>
         </relayhost>
         <smtpauth_enabled type="BooleanField">
             <default>0</default>