From a713ac8c483cff08fe69ad8e4e35f994a673af43 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Fri, 3 Feb 2017 17:41:13 +0100 Subject: [PATCH 001/139] tcpdump: Update to 4.9.0 For details see: http://www.tcpdump.org/tcpdump-changes.txt Removed unrecognized options: --disable-nls Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- lfs/tcpdump | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lfs/tcpdump b/lfs/tcpdump index cfeaffac6..42536f16a 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -24,7 +24,7 @@ include Config -VER = 4.8.1 +VER = 4.9.0 THISAPP = tcpdump-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tcpdump -PAK_VER = 7 +PAK_VER = 8 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 32f57943649f276e09236ba66622bb0c +$(DL_FILE)_MD5 = 2b83364eef53b63ca3181b4eb56dab0c install : $(TARGET) @@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && \ ./configure \ --prefix=/usr \ - --disable-nls \ --with-crypto \ --without-smi From 6c31e0993c33155c8514b83a291f0772e021b402 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Fri, 3 Feb 2017 18:13:29 +0100 Subject: [PATCH 002/139] wget: Update to 1.19 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- lfs/wget | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/wget b/lfs/wget index c22a9782e..baf4df069 100644 --- a/lfs/wget +++ b/lfs/wget @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team # +# Copyright (C) 2007-2017 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.18 +VER = 1.19 THISAPP = wget-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = af9ca95a4bb8ac4a9bf10aeae66fa5ec +$(DL_FILE)_MD5 = 1814393c5955a6148ff6d82c4a9e3c21 install : $(TARGET) From 4b5952148cad19a2b4ad88fa96b558730964d2d6 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sat, 4 Feb 2017 11:31:58 +0100 Subject: [PATCH 003/139] BUG11284: Typo in 'it.pl' "On line 2380 'urlfilter configuration' => 'Configurazione filttri per URL' must be corrected in 'urlfilter configuration' => 'Configurazione filtri per URL'" Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- langs/it/cgi-bin/it.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index b039cdbe0..41a277d69 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -2377,7 +2377,7 @@ 'urlfilter category log' => 'Dividere log per categorie', 'urlfilter category name error' => 'Blacklist category name required', 'urlfilter client' => 'Client', -'urlfilter configuration' => 'Configurazione filttri per URL', +'urlfilter configuration' => 'Configurazione filtri per URL', 'urlfilter constraint definition' => 'Impostazione', 'urlfilter constraint outside' => 'outside', 'urlfilter constraint within' => 'within', From 40065ca77362f6191279331b18781ef64e3fb588 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sat, 4 Feb 2017 11:59:58 +0100 Subject: [PATCH 004/139] BUG10972: Typo in 'de.pl' Second try... ;-) First: "Submitted by IT Superhack on Dec. 18, 2015, 5:48 p.m." Signed-off-by: Matthias Fischer Signed-off-by: Timmothy Wilson Signed-off-by: Michael Tremer --- langs/de/cgi-bin/de.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 261b92fe7..54f3ae1a7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1913,7 +1913,7 @@ 'red1' => 'ROT', 'references' => 'Referenzen', 'refresh' => 'Aktualisieren', -'refresh index page while connected' => 'Aktualisere index.cgi Seite während der Verbindung', +'refresh index page while connected' => 'Aktualisiere index.cgi Seite während der Verbindung', 'refresh update list' => 'Aktualisiere Update-Liste', 'registered user rules' => 'Sourcefire VRT Regeln für registrierte Benutzer', 'released' => 'Freigegeben', From a0a33a8f104ca44195ec04528113373b54a4c735 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sat, 4 Feb 2017 11:23:26 +0100 Subject: [PATCH 005/139] BUG11271 / GeoIP: Download GeoIP database via HTTPS For details see: https://bugzilla.ipfire.org/show_bug.cgi?id=11271 Download GEoIP database per HTTPS download. Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- src/scripts/xt_geoip_update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update index 0ee774470..0aea4d03e 100644 --- a/src/scripts/xt_geoip_update +++ b/src/scripts/xt_geoip_update @@ -25,7 +25,7 @@ TMP_FILE=$(mktemp -p $TMP_PATH) SCRIPT_PATH=/usr/local/bin DEST_PATH=/usr/share/xt_geoip -DL_URL=http://geolite.maxmind.com/download/geoip/database +DL_URL=https://geolite.maxmind.com/download/geoip/database DL_FILE=GeoIPCountryCSV.zip CSV_FILE=GeoIPCountryWhois.csv From d9dc3749190b9f372fd6eeb7324645dfe3de6fa2 Mon Sep 17 00:00:00 2001 From: Gabriel Rolland Date: Tue, 7 Feb 2017 12:17:12 +0100 Subject: [PATCH 006/139] Translation fixes in it.pl Signed-off-by: Michael Tremer --- langs/it/cgi-bin/it.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 41a277d69..0959a6512 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -392,7 +392,7 @@ 'backup explain key no2' => 'legacy floppy backups are not concerned with this key.', 'backup export key' => 'Export key', 'backup extract key' => 'Extract key', -'backup from' => 'Backup from', +'backup from' => 'Backup del', 'backup generate key' => 'Generate key', 'backup import dat file' => 'Import a backup (.dat) file', 'backup import key' => 'Import key', @@ -407,7 +407,7 @@ 'backup to floppy' => 'Backup to floppy', 'backupaddon' => 'Addon Backup', 'backupprofile' => 'In case reconnection fails, switch to profile', -'backups' => 'backups', +'backups' => 'Backups', 'backupwarning' => 'Per favore prima di ripristinare il backup del sistema e/o il backup addon, Si prega di mantenere il nome del file originale, di quando é stato scaricato.', 'bad characters in' => 'Bad characters in ', 'bad characters in script field' => 'Bad characters in script field', @@ -923,7 +923,7 @@ 'fireinfo is disabled' => 'Fireinfo is disabled', 'fireinfo is enabled' => 'Fireinfo is enabled', 'fireinfo is submitted' => 'Your profile is submitted to the fireinfo service.', -'fireinfo is submitted button' => 'No, I do not want to send my profile anymore', +'fireinfo is submitted button' => 'No, non voglio più inviare il mio profilo', 'fireinfo kernel version' => 'Kernel version', 'fireinfo not submitted' => 'Your profile is not submitted to the fireinfo service.', 'fireinfo not submitted button' => 'Yes, I want to send my profile', @@ -1950,13 +1950,13 @@ 'server reserved' => 'The connection name server is reserved and not allowed', 'server restart' => 'You are not able to save any changes while the OpenVPN server is running.', 'server string' => 'Server String', -'service' => 'Service', +'service' => 'Servizio', 'service added' => 'Custom network service added', 'service name' => 'Service name:', 'service removed' => 'Custom network service removed', 'service updated' => 'Custom network service updated', 'servicename' => 'Service Name', -'services' => 'Servizio', +'services' => 'Servizi', 'services settings' => 'Firewall-Impostazioni Servizi', 'set' => 'set', 'set time now' => 'Set time now', @@ -2100,7 +2100,7 @@ 'test email was sent' => 'Testemail was send successfully', 'the following update was successfully installed' => 'The following update was successfully installed', 'the statistics were last updated at' => 'The statistics were last updated at', -'theme' => 'Teme Grafico', +'theme' => 'Tema grafico', 'there are updates' => 'There are updates available for your system. Please go to the "updates" section for more information.', 'there are updates available' => 'There are updates available for your system. It is strongly urged that you install them as soon as possible.', 'there was no file upload' => 'There was no file upload.', From c008a5a00e963796a11ea6e1f59f0e801fa1a088 Mon Sep 17 00:00:00 2001 From: Gabriel Rolland Date: Tue, 7 Feb 2017 11:44:05 +0100 Subject: [PATCH 007/139] Typo in it.pl Signed-off-by: Michael Tremer --- langs/it/cgi-bin/it.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 0959a6512..36698fd2c 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -124,7 +124,7 @@ 'advproxy IDENT unauthorized users' => 'Gli utenti non autorizzati (uno per riga)', 'advproxy IDENT use negative access list' => 'Utilizzare il controllo degli accessi negativo', 'advproxy IDENT use positive access list' => 'Utilizzare il controllo degli accessi positivo', -'advproxy IDENT user based access restrictions' => 'Restrizioni di accesso basato sull utente', +'advproxy IDENT user based access restrictions' => 'Restrizioni di accesso basato sull\'utente', 'advproxy LDAP ADS' => 'Active Directory', 'advproxy LDAP NDS' => 'Novell eDirectory', 'advproxy LDAP V2' => 'LDAP versione 2', @@ -210,7 +210,7 @@ 'advproxy cre disabled' => 'The management interface has been disabled by the administrator', 'advproxy cre group definitions' => 'Definizioni del gruppo in classe', 'advproxy cre supervisors' => 'Indirizzi IP Supervisore (uno per riga)', -'advproxy destination ports' => 'Porte di destinatinazione', +'advproxy destination ports' => 'Porte di destinazione', 'advproxy download throttling' => 'Limiti Download', 'advproxy enabled' => 'Abilitato', 'advproxy enabled on' => 'Abilitato su', @@ -1967,7 +1967,7 @@ 'shared' => 'shared', 'sharename' => 'Sharename', 'shares' => 'Shares', -'show ajax speedmeter in footer' => 'Mostra la velocita tramita Ajax', +'show ajax speedmeter in footer' => 'Mostra la velocità tramite Ajax', 'show areas' => 'show areas', 'show ca certificate' => 'Show CA certificate', 'show certificate' => 'Show file', @@ -2601,7 +2601,7 @@ 'wireless' => 'Wireless', 'wireless config added' => 'Wireless config added', 'wireless config changed' => 'Wireless config changed', -'wireless configuration' => 'Configuratione Wireless', +'wireless configuration' => 'Configurazione Wireless', 'wlan client' => 'Wireless client', 'wlan client advanced settings' => 'impostazioni avanzate Wireless client', 'wlan client and' => 'and', @@ -2619,7 +2619,7 @@ 'wlan client group cipher' => 'Group cipher', 'wlan client group key algorithm' => 'GKA', 'wlan client invalid key length' => 'Invalid key length.', -'wlan client new entry' => 'Crea nuova configuratione wireless client', +'wlan client new entry' => 'Crea nuova configurazione wireless client', 'wlan client new network' => 'Nuovo network', 'wlan client pairwise cipher' => 'Pairwise cipher', 'wlan client pairwise key algorithm' => 'PKA', @@ -2642,7 +2642,7 @@ 'wlanap informations' => 'Informationi', 'wlanap interface' => 'Selezione interfaccia', 'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Deve contenere dai 6 ai 63 caratteri.', -'wlanap link dhcp' => 'Configuratione Wireless Lan DHCP', +'wlanap link dhcp' => 'Configurazione Wireless Lan DHCP', 'wlanap link wireless' => 'Activate Wireless Lan clients', 'wlanap no interface' => 'Selected interface is not a Wirless Lan card!', 'wlanap none' => 'none', From c72bbdb029e24c366d75ecafea6a6c333b574ed2 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Fri, 10 Feb 2017 22:44:58 +0100 Subject: [PATCH 008/139] bind: Update to 9.11.0-P3 For details see: https://ftp.isc.org/isc/bind9/9.11.0-P3/RELEASE-NOTES-bind-9.11.0-P3.html "BIND 9.11.0-P3 addresses the security issue described in CVE-2017-3135, and fixes a regression introduced in a prior security release. BIND 9.11.0-P2 addresses the security issues described in CVE-2016-9131, CVE-2016-9147, CVE-2016-9444 and CVE-2016-9778. BIND 9.11.0-P1 addresses the security issue described in CVE-2016-8864. ... Security Fixes If a server is configured with a response policy zone (RPZ) that rewrites an answer with local data, and is also configured for DNS64 address mapping, a NULL pointer can be read triggering a server crash. This flaw is disclosed in CVE-2017-3135. [RT #44434] A coding error in the nxdomain-redirect feature could lead to an assertion failure if the redirection namespace was served from a local authoritative data source such as a local zone or a DLZ instead of via recursive lookup. This flaw is disclosed in CVE-2016-9778. [RT #43837] named could mishandle authority sections with missing RRSIGs, triggering an assertion failure. This flaw is disclosed in CVE-2016-9444. [RT #43632] named mishandled some responses where covering RRSIG records were returned without the requested data, resulting in an assertion failure. This flaw is disclosed in CVE-2016-9147. [RT #43548] named incorrectly tried to cache TKEY records which could trigger an assertion failure when there was a class mismatch. This flaw is disclosed in CVE-2016-9131. [RT #43522] It was possible to trigger assertions when processing responses containing answers of type DNAME. This flaw is disclosed in CVE-2016-8864. [RT #43465]" Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- lfs/bind | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/bind b/lfs/bind index d25c2df9f..e178219c2 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.0-P2 +VER = 9.11.0-P3 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b8ccec541de18ac2716e7a8268baaaba +$(DL_FILE)_MD5 = 311787a0a69345a1f1cf7869b0266bf0 install : $(TARGET) From ef784313d101fee621e3273cf14eb59cf43bbb10 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Tue, 14 Feb 2017 18:45:43 +0100 Subject: [PATCH 009/139] wget: Update to 1.19.1 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- lfs/wget | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/wget b/lfs/wget index baf4df069..8d3d13c27 100644 --- a/lfs/wget +++ b/lfs/wget @@ -24,7 +24,7 @@ include Config -VER = 1.19 +VER = 1.19.1 THISAPP = wget-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1814393c5955a6148ff6d82c4a9e3c21 +$(DL_FILE)_MD5 = d30d82186b93fcabb4116ff513bfa9bd install : $(TARGET) From dcb406cc675c42f9add4a41c8a1e07eea7c3ab08 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 15 Feb 2017 10:11:58 +0000 Subject: [PATCH 010/139] IPsec: Allow to create on-demand connections This will create IPsec VPN connections with auto=route set instead of auto=start which will cause the connection being created, but not brought up yet. As soon as the first packet is received, the connection will be established and data will be passed through it. This allows IPFire to handle more VPN connections on weaker systems and avoids negotiating many connections which are rarely used. Suggested-by: Tom Rymes Signed-off-by: Michael Tremer Fixes: #10733 --- doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.it | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 +++ doc/language_issues.ru | 3 +++ doc/language_issues.tr | 3 +++ doc/language_missings | 12 +++++++++++ html/cgi-bin/vpnmain.cgi | 43 +++++++++++++++++++++++++++++----------- langs/de/cgi-bin/de.pl | 3 +++ langs/en/cgi-bin/en.pl | 3 +++ 11 files changed, 70 insertions(+), 12 deletions(-) diff --git a/doc/language_issues.es b/doc/language_issues.es index 60ba499c9..36d4a8211 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1144,6 +1144,9 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 863b5291a..b21c33851 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1161,6 +1161,9 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.it b/doc/language_issues.it index 6efef40f4..e7230280f 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -819,6 +819,9 @@ WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.nl b/doc/language_issues.nl index c9b10dcd6..22a893437 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -867,6 +867,9 @@ WARNING: untranslated string: uncheck all WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 60ba499c9..36d4a8211 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1144,6 +1144,9 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 255df2f68..fc727d607 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1139,6 +1139,9 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 8cf2dfe11..59c904657 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -752,4 +752,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_missings b/doc/language_missings index 32e1e48ec..49def615f 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -561,6 +561,9 @@ < vendor < visit us at < vpn keyexchange +< vpn start action +< vpn start action route +< vpn start action start < vpn statistic n2n < vpn statistic rw < wlanap access point @@ -1175,6 +1178,9 @@ < vendor < visit us at < vpn keyexchange +< vpn start action +< vpn start action route +< vpn start action start < vpn statistic n2n < vpn statistic rw < wlanap country @@ -1754,6 +1760,9 @@ < vendor < visit us at < vpn keyexchange +< vpn start action +< vpn start action route +< vpn start action start < vpn statistic n2n < vpn statistic rw < wlanap country @@ -2338,6 +2347,9 @@ < vendor < visit us at < vpn keyexchange +< vpn start action +< vpn start action route +< vpn start action start < vpn statistic n2n < vpn statistic rw < week-graph diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index f1cffb884..b6469c03c 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -108,6 +108,7 @@ $cgiparams{'RW_NET'} = ''; $cgiparams{'DPD_DELAY'} = '30'; $cgiparams{'DPD_TIMEOUT'} = '120'; $cgiparams{'FORCE_MOBIKE'} = 'off'; +$cgiparams{'START_ACTION'} = 'start'; &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'}); ### @@ -401,12 +402,17 @@ sub writeipsecfiles { print CONF "\trightrsasigkey=%cert\n"; } + my $start_action = $lconfighash{$key}[33]; + if (!$start_action) { + $start_action = "start"; + } + # Automatically start only if a net-to-net connection if ($lconfighash{$key}[3] eq 'host') { print CONF "\tauto=add\n"; print CONF "\trightsourceip=$lvpnsettings{'RW_NET'}\n"; } else { - print CONF "\tauto=start\n"; + print CONF "\tauto=$start_action\n"; } # Fragmentation @@ -1778,7 +1784,7 @@ END my $key = $cgiparams{'KEY'}; if (! $key) { $key = &General::findhasharraykey (\%confighash); - foreach my $i (0 .. 32) { $confighash{$key}[$i] = "";} + foreach my $i (0 .. 33) { $confighash{$key}[$i] = "";} } $confighash{$key}[0] = $cgiparams{'ENABLED'}; $confighash{$key}[1] = $cgiparams{'NAME'}; @@ -2256,6 +2262,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $confighash{$cgiparams{'KEY'}}[30] = $cgiparams{'DPD_TIMEOUT'}; $confighash{$cgiparams{'KEY'}}[31] = $cgiparams{'DPD_DELAY'}; $confighash{$cgiparams{'KEY'}}[32] = $cgiparams{'FORCE_MOBIKE'}; + $confighash{$cgiparams{'KEY'}}[33] = $cgiparams{'START_ACTION'}; &General::writehasharray("${General::swroot}/vpn/config", \%confighash); &writeipsecfiles(); if (&vpnenabled) { @@ -2283,6 +2290,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $cgiparams{'DPD_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[30]; $cgiparams{'DPD_DELAY'} = $confighash{$cgiparams{'KEY'}}[31]; $cgiparams{'FORCE_MOBIKE'} = $confighash{$cgiparams{'KEY'}}[32]; + $cgiparams{'START_ACTION'} = $confighash{$cgiparams{'KEY'}}[33]; if (!$cgiparams{'DPD_DELAY'}) { $cgiparams{'DPD_DELAY'} = 30; @@ -2291,6 +2299,10 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || if (!$cgiparams{'DPD_TIMEOUT'}) { $cgiparams{'DPD_TIMEOUT'} = 120; } + + if (!$cgiparams{'START_ACTION'}) { + $cgiparams{'START_ACTION'} = "start"; + } } ADVANCED_ERROR: @@ -2387,6 +2399,10 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $selected{'DPD_ACTION'}{'none'} = ''; $selected{'DPD_ACTION'}{$cgiparams{'DPD_ACTION'}} = "selected='selected'"; + $selected{'START_ACTION'}{'route'} = ''; + $selected{'START_ACTION'}{'start'} = ''; + $selected{'START_ACTION'}{$cgiparams{'START_ACTION'}} = "selected='selected'"; + &Header::showhttpheaders(); &Header::openpage($Lang::tr{'ipsec'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -2406,7 +2422,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || } &Header::openbox('100%', 'left', "$Lang::tr{'advanced'}:"); - print < @@ -2599,9 +2615,16 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || IKE+ESP: $Lang::tr{'use only proposed settings'} + + + + - +