Merge pull request #60 from stephdl/verifyUser_CNFix

Remove OtpStatus & fix perl path NethServer/dev#6111
NethServer · Apr 6, 2020 · 1bd364e · 1bd364e
2 parents 7ce9106 + 5e2d4c7
commit 1bd364e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...connect-check-username-equal-certficateCN → ...onnect-check-username-equal-certificateCN b/...connect-check-username-equal-certficateCN → ...onnect-check-username-equal-certificateCN
@@ -1,4 +1,4 @@
-#!/bin/perl
+#!/usr/bin/perl
 #
 # Copyright (C) 2020 Nethesis S.r.l.
 # http://www.nethesis.it - nethserver@nethesis.it
@@ -29,11 +29,10 @@ use esmith::ConfigDB;
 
 my $db = esmith::ConfigDB->open_ro();
 my $AuthMode = $db->get_prop('openvpn@host-to-net', 'AuthMode') || 'password';
-my $OtpStatus = $db->get_prop('openvpn@host-to-net', 'OtpStatus') || 'disabled';
 my $DomainName = $db->get_value('DomainName') || '';
 
-# we exclude two authentication modes (certificate without OTP & password) 
-if (($AuthMode eq 'certificate' && $OtpStatus eq 'disabled') || ($AuthMode eq 'password')) {
+# we exclude two authentication modes (certificate & password) 
+if (($AuthMode eq 'certificate') || ($AuthMode eq 'password')) {
     exit 0;
 }