Merge remote-tracking branch 'amarx/BETA3' into next

diff --combined html/cgi-bin/vpnmain.cgi
index 627b19159d9b252e087fb0ca67867829464e5852,5affdd85147bfd6ff4f443fc48df670347a0746e..f5ec50079a64dd9ff0f0577a3ed6e2e1cb437624
--- 1/html/cgi-bin/vpnmain.cgi
--- 2/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@@ -1225,7 -1225,7 +1225,7 @@@ EN
      } else {
        $errormessage = $Lang::tr{'invalid key'};
      }
 -
 +      &General::firewall_reload();
  ###
  ### Choose between adding a host-net or net-net connection
  ###
@@@ -1407,14 -1407,13 +1407,13 @@@ EN
            goto VPNCONF_ERROR;
        }
  
- #temporary disabled (BUG 10294)
- #     if ($cgiparams{'TYPE'} eq 'net'){
- #             $errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'});
- #             if ($errormessage ne ''){
- #                     goto VPNCONF_ERROR;
- #             }
- #             
- #     }
+       if ($cgiparams{'TYPE'} eq 'net'){
+               $warnmessage=&General::checksubnets('',$cgiparams{'REMOTE_SUBNET'},'ipsec');
+               if ($warnmessage ne ''){
+                       $warnmessage=$Lang::tr{'remote subnet'}." ($cgiparams{'REMOTE_SUBNET'}) <br>".$warnmessage;
+               }
+       }
+ 
        if ($cgiparams{'AUTH'} eq 'psk') {
            if (! length($cgiparams{'PSK'}) ) {
                $errormessage = $Lang::tr{'pre-shared key is too short'};
@@@ -2612,6 -2611,16 +2611,16 @@@ EO
        &Header::closebox();
      }
  
+       if ($warnmessage) {
+               &Header::openbox('100%', 'left', $Lang::tr{'warning messages'});
+               print "$warnmessage<br>";
+               print "$Lang::tr{'fwdfw warn1'}<br>";
+               &Header::closebox();
+               print"<center><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'ok'}' style='width: 5em;'></form>";
+               &Header::closepage();
+               exit 0;
+       }
+ 
      &Header::openbox('100%', 'left', $Lang::tr{'global settings'});
      print <<END
      <form method='post' action='$ENV{'SCRIPT_NAME'}'>

diff --combined langs/de/cgi-bin/de.pl
index cf1430403927668d556757bc205db967a8851087,90222c42595a6b9ab72f82d6ec19522df549be44..67aa70f7bdf7402e1e05ae2148a7383c35df651f
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -481,7 -481,9 +481,9 @@@
  'ccd err iroute' => 'Netzadresse für Route ungültig.',
  'ccd err irouteexist' => 'Diese Route wird bereits verwendet.',
  'ccd err isipsecnet' => 'Diese Subnetzadresse wird bereits für ein IPsec-Netzwerk verwendet.',
+ 'ccd err isipsecrw' => 'Diese Subnetzadresse wird bereits für das IPsec-RW Netz verwendet.',
  'ccd err isovpnnet' => 'Subnetzadresse wird für bereits für den OpenVPN-Server verwendet!',
+ 'ccd err isovpnn2n' => 'Subnetzadresse wird für bereits für ein OpenVPN N2N verwendet.',
  'ccd err issubnet' => 'Subnetzadresse wird bereits verwendet.',
  'ccd err name' => 'Es muss ein Name angegeben werden.',
  'ccd err nameexist' => 'Name existiert bereits.',
@@@ -813,7 -815,6 +815,7 @@@
  'enter ack class' => 'Legen Sie hier die ACK-Klasse fest <br /> und klicken Sie danach auf <i>Speichern</i>.',
  'enter data' => 'Geben Sie die Daten ein <br /> und klicken Sie danach auf <i>Speichern</i>.',
  'entropy' => 'Entropie',
 +'entropy graphs' => 'Entropiegraphen',
  'err bk 1' => 'Fehler beim Erzeugen des Archivs',
  'err bk 10 password' => 'Fehler beim Datensicherungs-Passwort',
  'err bk 2 key' => 'Fehler beim Erzeugen der Schlüsseldatei',
@@@ -1006,6 -1007,7 +1008,7 @@@
  'fwdfw use srcport' => 'Quellport:',
  'fwdfw use srv' => 'Zielport:',
  'fwdfw useless rule' => 'Diese Regel ist nicht sinnvoll.',
+ 'fwdfw warn1' => 'Dies kann dazu führen, dass Firewallregeln auf Netze angewendet werden, für die sie nicht gedacht sind.',
  'fwdfw wd_fri' => 'Fr',
  'fwdfw wd_mon' => 'Mo',
  'fwdfw wd_sat' => 'Sa',
@@@ -1132,7 -1134,6 +1135,7 @@@
  'harddisk temperature' => 'Festplattentemperatur',
  'harddisk temperature graphs' => 'HDD-Diagramme',
  'hardware graphs' => 'Hardware-Diagramme',
 +'hardware support' => 'Hardware-Unterstützung',
  'hdd temperature in' => 'Festplattentemperatur in',
  'help' => 'Hilfe',
  'high' => 'Hoch',
@@@ -1508,7 -1509,6 +1511,7 @@@
  'no eciadsl synch.bin file' => 'Keine ECI ADSL Datei synch.bin vorhanden. Bitte hochladen.',
  'no filter pass' => 'Legen Sie hier die Standardklassen fest durch die nicht-gefilterte Pakete gehen.',
  'no fritzdsl driver' => 'Kein Fritz!DSL-Treiber vorhanden. Bitte hochladen.',
 +'no hardware random number generator' => 'Dieses System hat keine Entropiequelle.',
  'no information available' => 'Keine Informationen verfügbar.',
  'no log selected' => 'kein Log ausgewählt',
  'no modem selected' => 'Kein Modem ausgewählt',
@@@ -1979,8 -1979,6 +1982,8 @@@
  'swap usage per' => 'Nutzung von Auslagerungsspeicher (Swap) pro',
  'system' => 'System',
  'system graphs' => 'System-Diagramme',
 +'system has hwrng' => 'Dieses System hat einen Hardware-Zufallszahlengenerator.',
 +'system has rdrand' => 'Dieses System unterstützt Intel(R) RDRAND.',
  'system information' => 'Systeminformationen',
  'system log viewer' => 'Betrachter der System-Logdateien',
  'system logs' => 'System-Logdateien',

diff --combined langs/en/cgi-bin/en.pl
index 02b1a4383c928a7c5ec65404f589befc07c4b48f,f614f58f2e4c51112d8f744b99d660105418de70..a1d52f8d29588fd4a507b08bbd806a8bb2c87bbb
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -499,8 -499,10 +499,10 @@@
  'ccd err invalidnet' => 'Invalid IP address. Format: 192.168.0.0/24 or 192.168.0.0/255.255.255.0.',
  'ccd err iroute' => 'Network address for route is invalid.',
  'ccd err irouteexist' => 'This route is already in use.',
- 'ccd err isipsecnet' => 'The given subnet address already used by an IPsec network.',
+ 'ccd err isipsecnet' => 'The given subnet address is already used by an IPsec network.',
+ 'ccd err isipsecrw' => 'The given subnet address is already used by the IPsec rw network.',
  'ccd err isovpnnet' => 'Subnet address already in use for OpenVPN Server.',
+ 'ccd err isovpnn2n' => 'Subnet address already in use for an OpenVPN N2N.',
  'ccd err issubnet' => 'Subnet address already in use.',
  'ccd err name' => 'Please choose a name.',
  'ccd err nameexist' => 'Name already exists.',
@@@ -839,7 -841,6 +841,7 @@@
  'enter ack class' => 'Enter the ACK- Class <br /> and then press <i>Save</i>.',
  'enter data' => 'Enter your settings <br /> and then press <i>Save</i>.',
  'entropy' => 'Entropy',
 +'entropy graphs' => 'Entropy Graphs',
  'err bk 1' => 'Error creating archive',
  'err bk 10 password' => 'Error with backup password',
  'err bk 2 key' => 'Error creating key file',
@@@ -1032,6 -1033,7 +1034,7 @@@
  'fwdfw use srcport' => 'Source port:',
  'fwdfw use srv' => 'Destination port:',
  'fwdfw useless rule' => 'This rule is useless.',
+ 'fwdfw warn1' => 'This might lead to firewallrules which are applied to networks for which they are not intended to be.',
  'fwdfw wd_fri' => 'Fri',
  'fwdfw wd_mon' => 'Mon',
  'fwdfw wd_sat' => 'Sat',
@@@ -1160,7 -1162,6 +1163,7 @@@
  'harddisk temperature' => 'Harddisk Temperature',
  'harddisk temperature graphs' => 'HDD Graphs',
  'hardware graphs' => 'Hardware Graphs',
 +'hardware support' => 'Hardware Support',
  'hdd temperature in' => 'Harddisk temperature in',
  'help' => 'Help',
  'high' => 'High',
@@@ -1537,7 -1538,6 +1540,7 @@@
  'no eciadsl synch.bin file' => 'No ECI ADSL synch.bin file. Please upload.',
  'no filter pass' => 'Enter the standard class for non-filtered packets.',
  'no fritzdsl driver' => 'No Fritz!DSL driver.  Please upload.',
 +'no hardware random number generator' => 'This system has no source for entropy.',
  'no information available' => 'No information available.',
  'no log selected' => 'No log selected',
  'no modem selected' => 'No modem selected',
@@@ -2014,8 -2014,6 +2017,8 @@@
  'swap usage per' => 'Swap usage per',
  'system' => 'System',
  'system graphs' => 'System Graphs',
 +'system has hwrng' => 'This system has got a hardware random number generator.',
 +'system has rdrand' => 'This system has got support for Intel(R) RDRAND.',
  'system information' => 'System Information',
  'system log viewer' => 'System Log Viewer',
  'system logs' => 'System Logs',