Revision: 6479
http://ipcop.svn.sourceforge.net/ipcop/?rev=6479&view=rev
Author: owes
Date: 2012-03-14 19:09:16 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
Allow %defaultroute for RW with PSK. Even though openswan reports an error, the
RW can connect.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/ipsec.cgi
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
Modified: ipcop/trunk/html/cgi-bin/ipsec.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/ipsec.cgi 2012-03-14 14:13:06 UTC (rev 6478)
+++ ipcop/trunk/html/cgi-bin/ipsec.cgi 2012-03-14 19:09:16 UTC (rev 6479)
@@ -1221,8 +1221,9 @@
;
}
elsif (! $cgiparams{'KEY'}) {
- my $pskdisabled = ($vpnsettings{'VPN_IP'} eq '%defaultroute') ?
"disabled='disabled'" : '' ;
- $cgiparams{'PSK'} = $Lang::tr{'vpn incompatible use of defaultroute'}
if ($pskdisabled);
+# my $pskdisabled = ($vpnsettings{'VPN_IP'} eq '%defaultroute') ?
"disabled='disabled'" : '' ;
+ my $pskdisabled = '' ;
+# $cgiparams{'PSK'} = $Lang::tr{'vpn incompatible use of
defaultroute'} if ($pskdisabled);
my $cakeydisabled = ( ! -f "/var/ipcop/private/cakey.pem" ) ?
"disabled='disabled'" : '';
$cgiparams{'CERT_NAME'} = $Lang::tr{'vpn no full pki'} if
($cakeydisabled);
my $cacrtdisabled = ( ! -f "/var/ipcop/ca/cacert.pem" ) ?
"disabled='disabled'" : '';
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-03-14 14:13:06 UTC
(rev 6478)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-03-14 19:09:16 UTC
(rev 6479)
@@ -4,6 +4,7 @@
/home/httpd/cgi-bin/dhcp.cgi
/home/httpd/cgi-bin/hosts.cgi
/home/httpd/cgi-bin/index.cgi
+/home/httpd/cgi-bin/ipsec.cgi
/home/httpd/cgi-bin/logfirewall.cgi
/home/httpd/cgi-bin/logproxy.cgi
/home/httpd/cgi-bin/logsystem.cgi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
