From 1490e00a691073e46602dad4bfb80492c9cc04bc Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 8 Aug 2023 18:20:39 +0200
Subject: [PATCH] security/tinc: minor style fixes for
 https://github.com/opnsense/plugins/pull/3528

---
 .../mvc/app/models/OPNsense/Tinc/Tinc.xml         | 10 +++++-----
 .../opnsense/scripts/OPNsense/Tinc/lib/objects.py | 15 +++------------
 2 files changed, 8 insertions(+), 17 deletions(-)

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 91e71145a..f2da9989d 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
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/Tinc</mount>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <description>
         OPNsense Tinc VPN
     </description>
@@ -60,10 +60,10 @@
                     <MaximumValue>65535</MaximumValue>
                     <ValidationMessage>Ping timeout must be between 1...65535</ValidationMessage>
                 </pingtimeout>
-                    <StrictSubnets type="BooleanField">
-                        <default>0</default>
-                        <Required>N</Required>
-                    </StrictSubnets>
+                <StrictSubnets type="BooleanField">
+                    <default>0</default>
+                    <Required>Y</Required>
+                </StrictSubnets>
                 <privkey type="TextField">
                     <Required>Y</Required>
                 </privkey>
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 bd913af8d..ae4a291aa 100755
--- a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
+++ b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
@@ -82,10 +82,7 @@ class Network(NetwConfObject):
         return self._payload['mode']
 
     def get_debuglevel(self):
-        if len(self._payload['debuglevel']) > 1:
-            return self._payload['debuglevel'][1]
-        else:
-            return '0'
+        return self._payload['debuglevel'][1] if len(self._payload['debuglevel']) > 1 else '0'
 
     def set_hosts(self, hosts):
         for host in hosts:
@@ -95,16 +92,10 @@ class Network(NetwConfObject):
             self._hosts.append(hostObj)
 
     def set_PMTUDiscovery(self, value):
-        if value.text != '1':
-            self._payload['PMTUDiscovery'] = 'no'
-        else:
-            self._payload['PMTUDiscovery'] = 'yes'
+        self._payload['PMTUDiscovery'] = 'no' if value.text != '1' else 'yes'
 
     def set_StrictSubnets(self, value):
-        if value.text != '1':
-            self._payload['StrictSubnets'] = 'no'
-        else:
-            self._payload['StrictSubnets'] = 'yes'
+        self._payload['StrictSubnets'] = 'no' if value.text != '1' else 'yes'
 
     def config_text(self):
         result = list()