smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge-2.0-check_certs.patch

diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm
--- smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm  2009-01-16 01:46:11.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm        2009-01-16 01:45:49.000000000 +0100
@@ -478,23 +478,25 @@
 
 sub print_crt_not_ready_warning{
        my ($fm) = @_;
-       
-       if (( -z "$pubdir/cacert.pem") || 
-               #( -z "$privdir/takey.pem") ||
-               ( -z "$pubdir/cert.pem") ||
-               ( -z "$privdir/key.pem") ||
-               ( -z "$pubdir/cacrl.pem") || 
-               ( -z "$pubdir/dh.pem")){
+       # If any of the required files is missing or empty
+       # Warn the user 
+       if (
+               (( -z "$pubdir/cacert.pem" ) || ( ! -e "$pubdir/cacert.pem" )) ||
+               (( -z "$pubdir/cert.pem") || ( ! -e "$pubdir/cert.pem" )) ||
+               (( -z "$privdir/key.pem") || ( ! -e "$pubdir/key.pem" )) ||
+               (( -z "$pubdir/cacrl.pem") || ( ! -e "$pubdir/cacrl.pem" )) ||
+               (( -z "$pubdir/dh.pem") || ( ! -e "$pubdir/dh.pem" ))
+       ){
                
-        return $fm->localise('CRT_CONFIG_ERROR');
-    }
+               return $fm->localise('CRT_CONFIG_ERROR');
+       }
        return $fm->localise('CRT_CONFIG_OK');
 }
 
 sub print_client_config{
        my ($fm) = @_;
        my $q = $fm->{cgi};
-    my $proto = get_prop('','proto','udp');
+       my $proto = get_prop('','proto','udp');
        $proto = 'tcp-client' if ($proto eq 'tcp');
        my $port = ($proto eq 'udp' ? (get_prop('','UDPPort','1194')):(get_prop('','TCPPort','1194')));
        my $mtutest = get_prop('','mtuTest','enabled');
1	slords	1.1	diff -Nur -x '.orig' -x '.rej' smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm
2			--- smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm 2009-01-16 01:46:11.000000000 +0100
3			+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm 2009-01-16 01:45:49.000000000 +0100
4			@@ -478,23 +478,25 @@
5
6			sub print_crt_not_ready_warning{
7			my ($fm) = @_;
8			-
9			- if (( -z "$pubdir/cacert.pem") \|\|
10			- #( -z "$privdir/takey.pem") \|\|
11			- ( -z "$pubdir/cert.pem") \|\|
12			- ( -z "$privdir/key.pem") \|\|
13			- ( -z "$pubdir/cacrl.pem") \|\|
14			- ( -z "$pubdir/dh.pem")){
15			+ # If any of the required files is missing or empty
16			+ # Warn the user
17			+ if (
18			+ (( -z "$pubdir/cacert.pem" ) \|\| ( ! -e "$pubdir/cacert.pem" )) \|\|
19			+ (( -z "$pubdir/cert.pem") \|\| ( ! -e "$pubdir/cert.pem" )) \|\|
20			+ (( -z "$privdir/key.pem") \|\| ( ! -e "$pubdir/key.pem" )) \|\|
21			+ (( -z "$pubdir/cacrl.pem") \|\| ( ! -e "$pubdir/cacrl.pem" )) \|\|
22			+ (( -z "$pubdir/dh.pem") \|\| ( ! -e "$pubdir/dh.pem" ))
23			+ ){
24
25			- return $fm->localise('CRT_CONFIG_ERROR');
26			- }
27			+ return $fm->localise('CRT_CONFIG_ERROR');
28			+ }
29			return $fm->localise('CRT_CONFIG_OK');
30			}
31
32			sub print_client_config{
33			my ($fm) = @_;
34			my $q = $fm->{cgi};
35			- my $proto = get_prop('','proto','udp');
36			+ my $proto = get_prop('','proto','udp');
37			$proto = 'tcp-client' if ($proto eq 'tcp');
38			my $port = ($proto eq 'udp' ? (get_prop('','UDPPort','1194')):(get_prop('','TCPPort','1194')));
39			my $mtutest = get_prop('','mtuTest','enabled');