From patchwork Thu Dec 1 17:22:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 6265 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NNNGL3K84z3xl0 for ; Thu, 1 Dec 2022 17:23:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NNNFy3YNZz2yT; Thu, 1 Dec 2022 17:23:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NNNFq2DXdz2ywY; Thu, 1 Dec 2022 17:23:27 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NNNFm0PB9z30CW for ; Thu, 1 Dec 2022 17:23:24 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "michael.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NNNFk5VS3z2sr; Thu, 1 Dec 2022 17:23:22 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4NNNFj5tZBzTjnL; Thu, 1 Dec 2022 17:23:21 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 07/29] network: Drop any traces of ISDN Date: Thu, 1 Dec 2022 17:22:56 +0000 Message-Id: <20221201172318.3166615-7-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221201172318.3166615-1-michael.tremer@ipfire.org> References: <20221201172318.3166615-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This has been removed a long time ago and we should probably spend a little bit more time on keeping the networking code tidy :) Signed-off-by: Michael Tremer --- config/rootfiles/common/configroot | 2 -- doc/language_issues.de | 5 ----- doc/language_issues.en | 2 +- doc/language_issues.es | 1 - doc/language_issues.fr | 5 ----- doc/language_issues.it | 5 ----- doc/language_issues.nl | 5 ----- doc/language_issues.pl | 5 ----- doc/language_issues.ru | 5 ----- doc/language_issues.tr | 5 ----- html/cgi-bin/pppsetup.cgi | 16 +++++----------- langs/de/cgi-bin/de.pl | 5 ----- langs/en/cgi-bin/en.pl | 5 ----- langs/es/cgi-bin/es.pl | 1 - langs/fr/cgi-bin/fr.pl | 5 ----- langs/it/cgi-bin/it.pl | 5 ----- langs/nl/cgi-bin/nl.pl | 5 ----- langs/pl/cgi-bin/pl.pl | 5 ----- langs/ru/cgi-bin/ru.pl | 5 ----- langs/tr/cgi-bin/tr.pl | 5 ----- lfs/configroot | 4 ++-- src/ppp/ip-up | 5 ----- 22 files changed, 8 insertions(+), 98 deletions(-) diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 4d631cea5..bc979cf2c 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -85,8 +85,6 @@ var/ipfire/ipblocklist-functions.pl var/ipfire/ipblocklist #var/ipfire/ipblocklist/modified #var/ipfire/ipblocklist/settings -var/ipfire/isdn -#var/ipfire/isdn/settings var/ipfire/key var/ipfire/lang.pl var/ipfire/langs diff --git a/doc/language_issues.de b/doc/language_issues.de index 5cbcb1111..6a5f5f108 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -376,7 +376,6 @@ WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 -WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id @@ -424,10 +423,6 @@ WARNING: translation string unused: ipblocklist category scanner WARNING: translation string unused: ipfire side WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules -WARNING: translation string unused: isdn -WARNING: translation string unused: isdn settings -WARNING: translation string unused: isdn1 -WARNING: translation string unused: isdn2 WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version diff --git a/doc/language_issues.en b/doc/language_issues.en index c559c62a7..0a9b66ba0 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -2118,7 +2118,7 @@ WARNING: untranslated string: volup10 = Increase volume by 10 WARNING: untranslated string: volup5 = Increase volume by 5 WARNING: untranslated string: vpi number = VPI number: WARNING: untranslated string: vpn = VPN -WARNING: untranslated string: vpn altname syntax = SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.
email:an email address. Syntax email:copy takes the email field from the cert to be used.
DNS:a valid domain name.
URI:any valid uri.
RID:registered object identifier.
IP:an IP address.
Note:charset is limited and case is significant.
Example:
e-mail:ipfire@foo.org,email:copy,DNS:www.ipfire.org,IP:127.0.0.1,URI:http://url/to/something +WARNING: untranslated string: vpn altname syntax = SubjectAltName is a comma separated list of email, dns, uri, rid and ip objects.
email:an email address. Syntax email:copy takes the email field from the cert to be used.
DNS:a valid domain name.
URI:any valid uri.
RID:registered object identifier.
IP:an IP address.
Note:charset is limited and case is significant.
Example:
email:ipfire@foo.org,email:copy,DNS:www.ipfire.org,IP:127.0.0.1,URI:http://url/to/something WARNING: untranslated string: vpn auth-dn = Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field WARNING: untranslated string: vpn broken = Broken WARNING: untranslated string: vpn connecting = CONNECTING diff --git a/doc/language_issues.es b/doc/language_issues.es index 2254e484f..b1530c655 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -415,7 +415,6 @@ WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 -WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 1ad14cd34..8d7fd2092 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -404,7 +404,6 @@ WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 -WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id @@ -454,10 +453,6 @@ WARNING: translation string unused: ipblocklist category scanner WARNING: translation string unused: ipfire side WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules -WARNING: translation string unused: isdn -WARNING: translation string unused: isdn settings -WARNING: translation string unused: isdn1 -WARNING: translation string unused: isdn2 WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version diff --git a/doc/language_issues.it b/doc/language_issues.it index c7638dbd6..a4fd5ff83 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -372,7 +372,6 @@ WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 -WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id @@ -417,10 +416,6 @@ WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules -WARNING: translation string unused: isdn -WARNING: translation string unused: isdn settings -WARNING: translation string unused: isdn1 -WARNING: translation string unused: isdn2 WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 4ef506798..39f546dbb 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -374,7 +374,6 @@ WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 -WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id @@ -419,10 +418,6 @@ WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules -WARNING: translation string unused: isdn -WARNING: translation string unused: isdn settings -WARNING: translation string unused: isdn1 -WARNING: translation string unused: isdn2 WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version diff --git a/doc/language_issues.pl b/doc/language_issues.pl index ffea51ab3..6cf1299e9 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -315,7 +315,6 @@ WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 -WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id @@ -359,10 +358,6 @@ WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: iptable rules -WARNING: translation string unused: isdn -WARNING: translation string unused: isdn settings -WARNING: translation string unused: isdn1 -WARNING: translation string unused: isdn2 WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 4257c0291..a1054070c 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -312,7 +312,6 @@ WARNING: translation string unused: host configuration WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hours2 -WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id @@ -356,10 +355,6 @@ WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: iptable rules -WARNING: translation string unused: isdn -WARNING: translation string unused: isdn settings -WARNING: translation string unused: isdn1 -WARNING: translation string unused: isdn2 WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version diff --git a/doc/language_issues.tr b/doc/language_issues.tr index da7241f22..b850312e6 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -398,7 +398,6 @@ WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 -WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id @@ -443,10 +442,6 @@ WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules -WARNING: translation string unused: isdn -WARNING: translation string unused: isdn settings -WARNING: translation string unused: isdn1 -WARNING: translation string unused: isdn2 WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 7fbb46a77..d7e5799ec 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -32,7 +32,6 @@ require "${General::swroot}/header.pl"; our %pppsettings=(); my %temppppsettings=(); our %modemsettings=(); -our %isdnsettings=(); our %netsettings=(); my %selected=(); my %checked=(); @@ -63,7 +62,7 @@ if ($pppsettings{'ACTION'} ne '' && &General::readhash("${General::swroot}/ppp/settings", \%pppsettings);} elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) { - unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp|vdsl|pppoeatm|pptpatm)$/) { + unless ($pppsettings{'TYPE'} =~ /^(modem|serial|pppoe|pptp|vdsl|pppoeatm|pptpatm)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } my $type = $pppsettings{'TYPE'}; @@ -72,10 +71,10 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) { - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1|isdn1|isdn2)$/) { + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) { + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) { @@ -93,7 +92,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) $errormessage = $Lang::tr{'profile name not given'}; $pppsettings{'PROFILENAME'} = ''; goto ERROR; } - if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/) { + if ($pppsettings{'TYPE'} =~ /^(modem)$/) { if ($pppsettings{'TELEPHONE'} eq '') { $errormessage = $Lang::tr{'telephone not set'}; goto ERROR; } @@ -739,7 +738,6 @@ print < END ; -if ($pppsettings{'TYPE'} ne 'isdn') { print < $Lang::tr{'persistent'} @@ -755,11 +753,7 @@ END print < -END -; -} -print < + $Lang::tr{'dod for dns'} diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a52d41531..94bb2736b 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1365,7 +1365,6 @@ 'hour-graph' => 'Stunde', 'hours' => 'Stunden', 'hours2' => 'Stunden', -'ibod for dual isdn only' => 'iBOD kann nur bei ISDN-Kanalbündelung genutzt werden.', 'icmp selected but no type' => 'ICMP wurde zwar als Protokoll gewählt, es wurde aber kein ICMP-Typ angegeben.', 'icmp type' => 'ICMP-Typ', 'id' => 'ID', @@ -1578,10 +1577,6 @@ 'iptmangles' => 'IPTable Mangles', 'iptnats' => 'IPTable Network Address Translation', 'ipts' => 'iptables', -'isdn' => 'ISDN', -'isdn settings' => 'Zusätzliche ISDN-Einstellungen:', -'isdn1' => 'Einfaches ISDN', -'isdn2' => 'ISDN-Kanalbündelung', 'itlb multihit' => 'iTLB MultiHit', 'january' => 'Januar', 'javascript menu error1' => 'Wenn die Drop-down-Menus nicht funktionieren, deaktivieren Sie Javascript auf der', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index bcba77aa4..d504c58b6 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1410,7 +1410,6 @@ 'hour-graph' => 'Hour', 'hours' => 'Hours', 'hours2' => 'Hours', -'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -1627,10 +1626,6 @@ 'iptmangles' => 'IPTable Mangles', 'iptnats' => 'IPTable Network Address Translation', 'ipts' => 'iptables', -'isdn' => 'ISDN', -'isdn settings' => 'Additional ISDN settings:', -'isdn1' => 'Single ISDN', -'isdn2' => 'Dual ISDN', 'itlb multihit' => 'iTLB MultiHit', 'january' => 'January', 'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 022d390fa..3daca873c 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1420,7 +1420,6 @@ 'hour-graph' => 'Hora', 'hours' => 'horas', 'hours2' => 'Horas', -'ibod for dual isdn only' => 'iBPD sólo puede usarse con ISDN dual', 'icmp selected but no type' => 'ICMP seleccionado como protocolo, pero no se ha seleccionado tipo de ICMP.', 'icmp type' => 'Tipo de ICMP', 'id' => 'ID', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index bfd3f9b5e..aa0697efc 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1411,7 +1411,6 @@ 'hour-graph' => 'Heure', 'hours' => 'heure(s)', 'hours2' => 'Heures', -'ibod for dual isdn only' => 'iBOD peut seulement être utilisé avec un double ISDN.', 'icmp selected but no type' => 'ICMP est le protocole sélectionné, mais il n\'y a aucun type ICMP spécifié.', 'icmp type' => 'Type ICMP', 'id' => 'ID', @@ -1631,10 +1630,6 @@ 'iptmangles' => 'Table IP Mangle ', 'iptnats' => 'Traduction d\'adresses réseaux table IP ', 'ipts' => 'Tables IP ', -'isdn' => 'RNIS', -'isdn settings' => 'Réglages RNIS supplémentaires :', -'isdn1' => 'RNIS unique', -'isdn2' => 'RNIS double', 'itlb multihit' => 'ITLB - erreur vérification machine', 'january' => 'Janvier', 'javascript menu error1' => 'Si les menus déroulants ne fonctionnent pas, désactivez le Javascript sur la', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 40575b404..7526d67ad 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1204,7 +1204,6 @@ 'hour-graph' => 'Ora', 'hours' => 'Ore', 'hours2' => 'Ore', -'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -1339,10 +1338,6 @@ 'iptmangles' => 'IPTable Mangles', 'iptnats' => 'IPTable Network Address Translation', 'ipts' => 'iptables', -'isdn' => 'ISDN', -'isdn settings' => 'Additional ISDN settings:', -'isdn1' => 'Single ISDN', -'isdn2' => 'Dual ISDN', 'january' => 'Gennaio', 'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the', 'javascript menu error2' => 'page.', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 865cfc5b3..4da924a74 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1200,7 +1200,6 @@ 'hour-graph' => 'Uur', 'hours' => 'uren', 'hours2' => 'Uren', -'ibod for dual isdn only' => 'iBOD kan alleen gebruikt worden met Dual ISDN.', 'icmp selected but no type' => 'ICMP als protocol geselecteerd, maar er is geen ICMP type gespecificeerd.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -1333,10 +1332,6 @@ 'iptmangles' => 'IPTable Mangles', 'iptnats' => 'IPTable Network Adrestranslatie', 'ipts' => 'iptables', -'isdn' => 'ISDN', -'isdn settings' => 'Extra ISDN instellingen:', -'isdn1' => 'Single ISDN', -'isdn2' => 'Dual ISDN', 'january' => 'Januari', 'javascript menu error1' => 'Als de menu\'s niet werken, schakel dan javascript uit op de', 'javascript menu error2' => 'pagina.', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index eba6fd098..6ff2dab7b 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -912,7 +912,6 @@ 'hour-graph' => 'Godzina', 'hours' => 'Godziny', 'hours2' => 'Godziny', -'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', 'icmp selected but no type' => 'Wybrano protokół ICMP, ale nie określono typu ICMP.', 'icmp type' => 'Typ ICMP', 'id' => 'ID', @@ -1038,10 +1037,6 @@ 'iptmangles' => 'IPTable Mangles', 'iptnats' => 'IPTable Network Address Translation', 'ipts' => 'iptables', -'isdn' => 'ISDN', -'isdn settings' => 'Dodatkowe ustawienia ISDN:', -'isdn1' => 'Pojedynczy ISDN', -'isdn2' => 'Podwójny ISDN', 'january' => 'Styczeń', 'javascript menu error1' => 'Jeżeli rozwijane menu nie działają poprawnie wyłącz javascript na', 'javascript menu error2' => 'stronie.', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 9e2b02d71..78a43c7d6 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -906,7 +906,6 @@ 'hour' => 'Час', 'hours' => 'Часы', 'hours2' => 'Часы', -'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -1031,10 +1030,6 @@ 'iptmangles' => 'IPTable Mangles', 'iptnats' => 'IPTable Network Address Translation', 'ipts' => 'iptables', -'isdn' => 'ISDN', -'isdn settings' => 'Additional ISDN settings:', -'isdn1' => 'Single ISDN', -'isdn2' => 'Dual ISDN', 'january' => 'Январь', 'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the', 'javascript menu error2' => 'page.', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index ad5567ce1..45fc16144 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1317,7 +1317,6 @@ 'hour-graph' => 'saat', 'hours' => 'saat', 'hours2' => 'saat', -'ibod for dual isdn only' => 'iBOD yalnızca çift ISDN ile kullanılabilir.', 'icmp selected but no type' => 'ICMP kuralı için seçildi ancak ICMP türü belirtildi.', 'icmp type' => 'ICMP Türü', 'id' => 'Kimlik Numarası (ID)', @@ -1457,10 +1456,6 @@ 'iptmangles' => 'IPTablo sıkıştırmaları', 'iptnats' => 'IPTablo ağ adres çevrimi', 'ipts' => 'IPTablolar', -'isdn' => 'ISDN', -'isdn settings' => 'Ek ISDN ayarları:', -'isdn1' => 'Tek ISDN', -'isdn2' => 'Çift ISDN', 'january' => 'Ocak', 'javascript menu error1' => 'Eğer aşağı açılır listeler çalışmıyorsa javascript seçeneğini devre dışı bırakın', 'javascript menu error2' => 'sayfa.', diff --git a/lfs/configroot b/lfs/configroot index ef92f5f08..2c09ae4a8 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -51,7 +51,7 @@ $(TARGET) : # Create all directories for i in addon-lang auth backup ca captive certs connscheduler crls ddns dhcp dhcpc dns dnsforward \ - ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist isdn key langs logging mac main \ + ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist key langs logging mac main \ menu.d modem optionsfw \ ovpn patches pakfire portfw ppp private proxy/advanced/cre \ proxy/calamaris/bin qos/bin red remote sensors suricata time \ @@ -66,7 +66,7 @@ $(TARGET) : dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/locationblock firewall/input firewall/outgoing \ fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/modified \ - ipblocklist/settings isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \ + ipblocklist/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \ diff --git a/src/ppp/ip-up b/src/ppp/ip-up index ee1683fdd..2e636e72d 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -24,11 +24,6 @@ eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings) -if [ "$TYPE" = "isdn" ]; then - DNS1="${MS_DNS1}" - DNS2="${MS_DNS2}" -fi - # Write DNS servers to configuration echo "${DNS1}" > /var/run/dns1 echo "${DNS2}" > /var/run/dns2