openvpn: Fix verify script.

[people/teissler/ipfire-2.x.git] / config / ovpn / verify

diff --git a/config/ovpn/verify b/config/ovpn/verify
index 72334296cabf27d8991b9a34687ca22963922511..1a1fcb501d83065ca5fb408580789b993740e921 100644 (file)
--- a/config/ovpn/verify
+++ b/config/ovpn/verify
@@ -30,8 +30,8 @@ my $CN    = $ARGV[1];
 exit 0 unless ($DEPTH eq "0");
 
 # Strip the CN from the X509 identifier.
-$CN =~ /\/CN=(.*)$/i;
-$CN = $1;
+$CN =~ /(\/|,\ )CN=(.*)$/i;
+$CN = $2;
 
 my %confighash = ();
 if (-f "${General::swroot}/ovpn/ovpnconfig"){
@@ -49,7 +49,7 @@ if (-f "${General::swroot}/ovpn/ovpnconfig"){
                exit 0 if ($cn eq $CN);
 
                # Compatibility code for incorrectly saved CNs.
-               $cn =~ s/\ /_/;
+               $cn =~ s/\ /_/g;
                exit 0 if ($cn eq $CN);
        }
 }