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');