From 9df2d8149fd3304e817611617ef6bb7e1a3e53cb Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 18 Jan 2021 11:56:17 +0100
Subject: [PATCH] security/tinc: sync with master

---
 security/tinc/Makefile                                        | 1 +
 .../tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml   | 4 ++--
 .../tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/security/tinc/Makefile b/security/tinc/Makefile
index b85f2f0211..45b3c7279b 100644
--- a/security/tinc/Makefile
+++ b/security/tinc/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		tinc
 PLUGIN_VERSION=		1.6
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		Tinc VPN
 PLUGIN_DEPENDS=		tinc
 PLUGIN_MAINTAINER=	ad@opnsense.org
diff --git a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
index f6a077d558..f3aa3805cf 100644
--- a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
+++ b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
@@ -23,7 +23,7 @@
                 </hostname>
                 <extaddress type="HostnameField">
                     <Required>N</Required>
-                    <IpAllowed>1</IpAllowed>
+                    <IpAllowed>Y</IpAllowed>
                     <FieldSeparator>,</FieldSeparator>
                     <AsList>Y</AsList>
                 </extaddress>
@@ -136,7 +136,7 @@
                 </extport>
                 <extaddress type="HostnameField">
                     <Required>N</Required>
-                    <IpAllowed>1</IpAllowed>
+                    <IpAllowed>Y</IpAllowed>
                     <FieldSeparator>,</FieldSeparator>
                     <AsList>Y</AsList>
                     <Constraints>
diff --git a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
index a0031d9b07..d35db341ac 100755
--- a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
+++ b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
@@ -141,7 +141,7 @@ def set_connectto(self, value):
         self._connectTo = value.text
 
     def get_subnets(self):
-        if not self._payload['subnet']:
+        if not 'subnet' in self._payload:
             return
         yield from self._payload['subnet'].split(',')