This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 83371d5f5705ca1605343f53c02588083a95d392 (commit) from 93aa811ed014f3bf91add965e7f41e9de73f213c (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 83371d5f5705ca1605343f53c02588083a95d392 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 9 01:16:14 2011 +0200
Fix ID information on IPSec configuration.
As the documentation of strongswan says, it is allowed to enter IP addresses as leftid or rightid without an "@" in the beginning.
Fixed that you can now enter something like "10.20.30.40".
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/49/filelists/files | 1 + html/cgi-bin/vpnmain.cgi | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index bac8769..032958b 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/es.pl diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 5558295..76b408d 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1383,15 +1383,15 @@ END
# Allow nothing or a string (DN,FDQN,) beginning with @ # with no comma but slashes between RID eg @O=FR/C=Paris/OU=myhome/CN=franck - if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[\w. =*/-]+|\d.\d.\d.\d)$/) || - ($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[\w. =*/-]+|\d.\d.\d.\d)$/) || + if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[\w. =*/-]+|\d+.\d+.\d+.\d+)$/) || + ($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[\w. =*/-]+|\d+.\d+.\d+.\d+)$/) || (($cgiparams{'REMOTE_ID'} eq $cgiparams{'LOCAL_ID'}) && ($cgiparams{'LOCAL_ID'} ne '')) ) { $errormessage = $Lang::tr{'invalid local-remote id'} . '<br />' . 'DER_ASN1_DN: @c=FR/ou=Paris/ou=Home/cn=*<br />' . 'FQDN: @ipfire.org<br />' . 'USER_FQDN: info@ipfire.org<br />' . - 'IPV4_ADDR: @123.123.123.123'; + 'IPV4_ADDR: 123.123.123.123'; goto VPNCONF_ERROR; } # If Auth is DN, verify existance of Remote ID.
hooks/post-receive -- IPFire 2.x development tree