From 85ff6ca821586b829b23615ec61b1be081670736 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Wed, 11 Sep 2019 13:16:43 +0200
Subject: [PATCH] mail/postfix: allow setting of supported IP protocols (#1493)

---
 mail/postfix/Makefile                                 |  2 +-
 mail/postfix/pkg-descr                                |  4 ++++
 .../controllers/OPNsense/Postfix/forms/general.xml    |  6 ++++++
 .../mvc/app/models/OPNsense/Postfix/General.xml       | 11 ++++++++++-
 .../service/templates/OPNsense/Postfix/main.cf        |  2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 405e292de..58f013fc2 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		postfix
-PLUGIN_VERSION=		1.10
+PLUGIN_VERSION=		1.11
 PLUGIN_COMMENT=		SMTP mail relay
 PLUGIN_DEPENDS=		postfix-sasl
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/mail/postfix/pkg-descr b/mail/postfix/pkg-descr
index bde2b8297..2d02a9000 100644
--- a/mail/postfix/pkg-descr
+++ b/mail/postfix/pkg-descr
@@ -6,6 +6,10 @@ is completely different.
 Plugin Changelog
 ================
 
+1.11
+
+* Allow suport for v4 or v6 only or both
+
 1.10
 
 * Add support for configuring sender_canonical_maps
diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml
index 4084f8fb4..2432b7b13 100644
--- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml
+++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml
@@ -35,6 +35,12 @@
         <type>text</type>
         <help>Port to listen on.</help>
     </field>
+    <field>
+        <id>general.ip_version</id>
+        <label>IP Version</label>
+        <type>dropdown</type>
+        <help>Choose which IP versions are allowed, defaults to all.</help>
+    </field>
     <field>
         <id>general.bind_address</id>
         <label>Bind SMTP Client Address</label>
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 e8ac59c6b..2e716d659 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.2.3</version>
+    <version>1.2.4</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -27,6 +27,15 @@
             <default>25</default>
             <Required>Y</Required>
         </inet_port>
+        <ip_version type="OptionField">
+            <default>all</default>
+            <Required>Y</Required>
+            <OptionValues>
+                <all>All</all>
+                <ipv4>IPv4</ipv4>
+                <ipv6>IPv6</ipv6>
+            </OptionValues>            
+        </inet_protocol>
         <bind_address type="NetworkField">
             <Required>N</Required>
             <AddressFamily>ipv4</AddressFamily>
diff --git a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
index a80bd07e9..a77d035c5 100644
--- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
+++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
@@ -26,7 +26,7 @@ html_directory = no
 manpage_directory = /usr/local/man
 sample_directory = /usr/local/etc/postfix
 readme_directory = no
-inet_protocols = all
+inet_protocols = {{ OPNsense.postfix.general.ip_version }}
 meta_directory = /usr/local/libexec/postfix
 shlib_directory = /usr/local/lib/postfix
 relay_domains = hash:/usr/local/etc/postfix/transport