Fix strictuserdn -> strictusercn option (#93)

pfsensible · Dec 19, 2023 · b069235 · b069235
1 parent 1334ca5
commit b069235
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/plugins/module_utils/openvpn_client.py b/plugins/module_utils/openvpn_client.py
@@ -29,7 +29,7 @@
     crl=dict(required=False, type='str'),
     cert=dict(required=False, type='str'),
     cert_depth=dict(default=1, required=False, type='int'),
-    strictuserdn=dict(default=False, required=False, type='bool'),
+    strictusercn=dict(default=False, required=False, type='bool'),
     shared_key=dict(required=False, type='str', no_log=True),
     dh_length=dict(default=2048, required=False, type='int'),
     ecdh_curve=dict(default='none', required=False, choices=['none', 'prime256v1', 'secp384r1', 'secp521r1']),
@@ -107,7 +107,7 @@ def _params_to_obj(self):
         if self.params['state'] == 'present':
             obj['custom_options'] = self.params['custom_options']
             self._get_ansible_param_bool(obj, 'disable')
-            self._get_ansible_param_bool(obj, 'strictuserdn')
+            self._get_ansible_param_bool(obj, 'strictusercn')
             obj['mode'] = self.params['mode']
             obj['dev_mode'] = self.params['dev_mode']
             obj['interface'] = self.params['interface']

diff --git a/plugins/module_utils/openvpn_server.py b/plugins/module_utils/openvpn_server.py
@@ -29,7 +29,7 @@
     crl=dict(required=False, type='str'),
     cert=dict(required=False, type='str'),
     cert_depth=dict(default=1, required=False, type='int'),
-    strictuserdn=dict(default=False, required=False, type='bool'),
+    strictusercn=dict(default=False, required=False, type='bool'),
     shared_key=dict(required=False, type='str', no_log=True),
     dh_length=dict(default=2048, required=False, type='int'),
     ecdh_curve=dict(default='none', required=False, choices=['none', 'prime256v1', 'secp384r1', 'secp521r1']),
@@ -119,7 +119,7 @@ def _params_to_obj(self):
         if self.params['state'] == 'present':
             obj['custom_options'] = self.params['custom_options']
             self._get_ansible_param_bool(obj, 'disable')
-            self._get_ansible_param_bool(obj, 'strictuserdn')
+            self._get_ansible_param_bool(obj, 'strictusercn')
             obj['mode'] = self.params['mode']
             obj['dev_mode'] = self.params['dev_mode']
             obj['interface'] = self.params['interface']
@@ -275,7 +275,7 @@ def _find_last_openvpn_idx(self):
     def _get_params_to_remove(self):
         """ returns the list of params to remove if they are not set """
         params_to_remove = []
-        for param in ['disable', 'strictuserdn', 'push_register_dns']:
+        for param in ['disable', 'strictusercn', 'push_register_dns']:
             if not self.params[param]:
                 params_to_remove.append(param)
 

diff --git a/plugins/modules/pfsense_openvpn_client.py b/plugins/modules/pfsense_openvpn_client.py
@@ -82,7 +82,7 @@
     required: false
     default: 1
     type: int
-  strictuserdn:
+  strictusercn:
     description: Enforce a match between the common name of the client certificate and the username given at login.
     default: false
     type: bool

diff --git a/plugins/modules/pfsense_openvpn_server.py b/plugins/modules/pfsense_openvpn_server.py
@@ -85,7 +85,7 @@
     required: false
     default: 1
     type: int
-  strictuserdn:
+  strictusercn:
     description: Enforce a match between the common name of the client certificate and the username given at login.
     default: false
     type: bool