smeserver-openvpn-s2s/contribs10/smeserver-openvpn-s2s-0.2-fix_daemon_id_validation.patch

diff -Nur smeserver-openvpn-s2s-0.2/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/openvpns2s.pm smeserver-openvpn-s2s-0.2_bz10446/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/openvpns2s.pm
--- smeserver-openvpn-s2s-0.2/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/openvpns2s.pm    2013-11-11 18:33:06.000000000 +0100
+++ smeserver-openvpn-s2s-0.2_bz10446/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/openvpns2s.pm    2017-10-25 15:22:01.895920386 +0200
@@ -67,7 +67,7 @@
     my $q = $fm->{cgi};
     my $conf = $q->param('conf_name');
 
-    if ($q->param('action' ne 'modify')){
+    if ($q->param('action') ne 'modify'){
         if ($ovpn_db->get($conf)){
             return $fm->error('CONF_CONFLICT','FIRST_PAGE');
         }
@@ -522,7 +522,7 @@
 sub validate_conf_name{
     my ($fm, $conf_name) = @_;
 
-    unless ($conf_name =~ /^([a-zA-Z0-9][\_\.\-a-zA-Z0-9]*)$/){
+    unless ($conf_name =~ /^([a-zA-Z0-9][\_\.\-a-zA-Z0-9]{0,9})$/){
         return $fm->localise('INVALID_CHARS',{string => $conf_name});
     }
     return "OK";
1	brianr	1.1	diff -Nur smeserver-openvpn-s2s-0.2/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/openvpns2s.pm smeserver-openvpn-s2s-0.2_bz10446/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/openvpns2s.pm
2			--- smeserver-openvpn-s2s-0.2/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/openvpns2s.pm 2013-11-11 18:33:06.000000000 +0100
3			+++ smeserver-openvpn-s2s-0.2_bz10446/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/openvpns2s.pm 2017-10-25 15:22:01.895920386 +0200
4			@@ -67,7 +67,7 @@
5			my $q = $fm->{cgi};
6			my $conf = $q->param('conf_name');
7
8			- if ($q->param('action' ne 'modify')){
9			+ if ($q->param('action') ne 'modify'){
10			if ($ovpn_db->get($conf)){
11			return $fm->error('CONF_CONFLICT','FIRST_PAGE');
12			}
13			@@ -522,7 +522,7 @@
14			sub validate_conf_name{
15			my ($fm, $conf_name) = @_;
16
17			- unless ($conf_name =~ /^([a-zA-Z0-9][\_\.\-a-zA-Z0-9]*)$/){
18			+ unless ($conf_name =~ /^([a-zA-Z0-9][\_\.\-a-zA-Z0-9]{0,9})$/){
19			return $fm->localise('INVALID_CHARS',{string => $conf_name});
20			}
21			return "OK";