From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 07/29] network: Drop any traces of ISDN Date: Thu, 01 Dec 2022 17:22:56 +0000 Message-ID: <20221201172318.3166615-7-michael.tremer@ipfire.org> In-Reply-To: <20221201172318.3166615-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6259697396796195016==" List-Id: --===============6259697396796195016== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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/con= figroot 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 =3D Increase volu= me by 10 WARNING: untranslated string: volup5 =3D Increase volume by 5 WARNING: untranslated string: vpi number =3D VPI number: WARNING: untranslated string: vpn =3D VPN -WARNING: untranslated string: vpn altname syntax =3D SubjectAltName is a com= ma separated list of e-mail, dns, uri, rid and ip objects.
email:an emai= l address. Syntax email:copy takes the email field from the cert to be used.<= br />DNS:a valid domain name.
URI:any valid uri.
RID:registered obj= ect identifier.
IP:an IP address.
Note:charset is limited and case = is significant.
Example:
e-mail:ipfire(a)foo.org,email:copy,DNS:www.ipfire.org,IP:127.0.0.1,URI:http://url/to= /something +WARNING: untranslated string: vpn altname syntax =3D SubjectAltName is a com= ma 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 obje= ct identifier.
IP:an IP address.
Note:charset is limited and case i= s significant.
Example:
email:ipfire(a)foo.org,email:= copy,DNS:www.ipfire.org,IP:127.0.0.1,URI:http://url/to/s= omething WARNING: untranslated string: vpn auth-dn =3D Peer is identified by either I= PV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field WARNING: untranslated string: vpn broken =3D Broken WARNING: untranslated string: vpn connecting =3D 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=3D(); my %temppppsettings=3D(); our %modemsettings=3D(); -our %isdnsettings=3D(); our %netsettings=3D(); my %selected=3D(); my %checked=3D(); @@ -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'} =3D~ /^(modem|serial|isdn|pppoe|pptp|vd= sl|pppoeatm|pptpatm)$/) { + unless ($pppsettings{'TYPE'} =3D~ /^(modem|serial|pppoe|pptp|vdsl|pp= poeatm|pptpatm)$/) { $errormessage =3D $Lang::tr{'invalid input'}; goto ERROR; } my $type =3D $pppsettings{'TYPE'}; @@ -72,10 +71,10 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) { - if ($pppsettings{'TYPE'} =3D~ /^(modem|serial|isdn)$/ && $pppsetting= s{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfco= mm0|rfcomm1|isdn1|isdn2)$/) { + if ($pppsettings{'TYPE'} =3D~ /^(modem|serial)$/ && $pppsettings{'CO= MPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|r= fcomm1)$/) { $errormessage =3D $Lang::tr{'invalid input'}; goto ERROR; } - if ($pppsettings{'TYPE'} =3D~ /^(modem|serial|isdn)$/ && $pppsetting= s{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) { + if ($pppsettings{'TYPE'} =3D~ /^(modem|serial)$/ && $pppsettings{'MO= NPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) { $errormessage =3D $Lang::tr{'invalid input'}; goto ERROR; } if ($pppsettings{'TYPE'} =3D~ /^(modem|serial)$/ && $pppsettings{'DT= ERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) { @@ -93,7 +92,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) $errormessage =3D $Lang::tr{'profile name not given'}; $pppsettings{'PROFILENAME'} =3D ''; goto ERROR; } - if ($pppsettings{'TYPE'} =3D~ /^(modem|isdn)$/) { + if ($pppsettings{'TYPE'} =3D~ /^(modem)$/) { if ($pppsettings{'TELEPHONE'} eq '') { $errormessage =3D $Lang::tr{'telephone not set'}; goto ERROR; } @@ -739,7 +738,6 @@ print < END ; -if ($pppsettings{'TYPE'} ne 'isdn') { print < $Lang::t= r{'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' =3D> 'Stunde', 'hours' =3D> 'Stunden', 'hours2' =3D> 'Stunden', -'ibod for dual isdn only' =3D> 'iBOD kann nur bei ISDN-Kanalb=C3=BCndelung g= enutzt werden.', 'icmp selected but no type' =3D> 'ICMP wurde zwar als Protokoll gew=C3=A4hlt= , es wurde aber kein ICMP-Typ angegeben.', 'icmp type' =3D> 'ICMP-Typ', 'id' =3D> 'ID', @@ -1578,10 +1577,6 @@ 'iptmangles' =3D> 'IPTable Mangles', 'iptnats' =3D> 'IPTable Network Address Translation', 'ipts' =3D> 'iptables', -'isdn' =3D> 'ISDN', -'isdn settings' =3D> 'Zus=C3=A4tzliche ISDN-Einstellungen:', -'isdn1' =3D> 'Einfaches ISDN', -'isdn2' =3D> 'ISDN-Kanalb=C3=BCndelung', 'itlb multihit' =3D> 'iTLB MultiHit', 'january' =3D> 'Januar', 'javascript menu error1' =3D> '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' =3D> 'Hour', 'hours' =3D> 'Hours', 'hours2' =3D> 'Hours', -'ibod for dual isdn only' =3D> 'iBOD can only be used with Dual ISDN.', 'icmp selected but no type' =3D> 'ICMP selected for protocol, but no ICMP ty= pe specified.', 'icmp type' =3D> 'ICMP Type', 'id' =3D> 'ID', @@ -1627,10 +1626,6 @@ 'iptmangles' =3D> 'IPTable Mangles', 'iptnats' =3D> 'IPTable Network Address Translation', 'ipts' =3D> 'iptables', -'isdn' =3D> 'ISDN', -'isdn settings' =3D> 'Additional ISDN settings:', -'isdn1' =3D> 'Single ISDN', -'isdn2' =3D> 'Dual ISDN', 'itlb multihit' =3D> 'iTLB MultiHit', 'january' =3D> 'January', 'javascript menu error1' =3D> 'If the drop down menus aren\'t working, disab= le 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' =3D> 'Hora', 'hours' =3D> 'horas', 'hours2' =3D> 'Horas', -'ibod for dual isdn only' =3D> 'iBPD s=C3=B3lo puede usarse con ISDN dual', 'icmp selected but no type' =3D> 'ICMP seleccionado como protocolo, pero no = se ha seleccionado tipo de ICMP.', 'icmp type' =3D> 'Tipo de ICMP', 'id' =3D> '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' =3D> 'Heure', 'hours' =3D> 'heure(s)', 'hours2' =3D> 'Heures', -'ibod for dual isdn only' =3D> 'iBOD peut seulement =C3=AAtre utilis=C3=A9 a= vec un double ISDN.', 'icmp selected but no type' =3D> 'ICMP est le protocole s=C3=A9lectionn=C3= =A9, mais il n\'y a aucun type ICMP sp=C3=A9cifi=C3=A9.', 'icmp type' =3D> 'Type ICMP', 'id' =3D> 'ID', @@ -1631,10 +1630,6 @@ 'iptmangles' =3D> 'Table IP Mangle ', 'iptnats' =3D> 'Traduction d\'adresses r=C3=A9seaux table IP ', 'ipts' =3D> 'Tables IP ', -'isdn' =3D> 'RNIS', -'isdn settings' =3D> 'R=C3=A9glages RNIS suppl=C3=A9mentaires :', -'isdn1' =3D> 'RNIS unique', -'isdn2' =3D> 'RNIS double', 'itlb multihit' =3D> 'ITLB - erreur v=C3=A9rification machine', 'january' =3D> 'Janvier', 'javascript menu error1' =3D> 'Si les menus d=C3=A9roulants ne fonctionnent = pas, d=C3=A9sactivez 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' =3D> 'Ora', 'hours' =3D> 'Ore', 'hours2' =3D> 'Ore', -'ibod for dual isdn only' =3D> 'iBOD can only be used with Dual ISDN.', 'icmp selected but no type' =3D> 'ICMP selected for protocol, but no ICMP ty= pe specified.', 'icmp type' =3D> 'ICMP Type', 'id' =3D> 'ID', @@ -1339,10 +1338,6 @@ 'iptmangles' =3D> 'IPTable Mangles', 'iptnats' =3D> 'IPTable Network Address Translation', 'ipts' =3D> 'iptables', -'isdn' =3D> 'ISDN', -'isdn settings' =3D> 'Additional ISDN settings:', -'isdn1' =3D> 'Single ISDN', -'isdn2' =3D> 'Dual ISDN', 'january' =3D> 'Gennaio', 'javascript menu error1' =3D> 'If the drop down menus aren\'t working, disab= le javascript on the', 'javascript menu error2' =3D> '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' =3D> 'Uur', 'hours' =3D> 'uren', 'hours2' =3D> 'Uren', -'ibod for dual isdn only' =3D> 'iBOD kan alleen gebruikt worden met Dual ISD= N.', 'icmp selected but no type' =3D> 'ICMP als protocol geselecteerd, maar er is= geen ICMP type gespecificeerd.', 'icmp type' =3D> 'ICMP Type', 'id' =3D> 'ID', @@ -1333,10 +1332,6 @@ 'iptmangles' =3D> 'IPTable Mangles', 'iptnats' =3D> 'IPTable Network Adrestranslatie', 'ipts' =3D> 'iptables', -'isdn' =3D> 'ISDN', -'isdn settings' =3D> 'Extra ISDN instellingen:', -'isdn1' =3D> 'Single ISDN', -'isdn2' =3D> 'Dual ISDN', 'january' =3D> 'Januari', 'javascript menu error1' =3D> 'Als de menu\'s niet werken, schakel dan javas= cript uit op de', 'javascript menu error2' =3D> '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' =3D> 'Godzina', 'hours' =3D> 'Godziny', 'hours2' =3D> 'Godziny', -'ibod for dual isdn only' =3D> 'iBOD can only be used with Dual ISDN.', 'icmp selected but no type' =3D> 'Wybrano protok=C3=B3=C5=82 ICMP, ale nie o= kre=C5=9Blono typu ICMP.', 'icmp type' =3D> 'Typ ICMP', 'id' =3D> 'ID', @@ -1038,10 +1037,6 @@ 'iptmangles' =3D> 'IPTable Mangles', 'iptnats' =3D> 'IPTable Network Address Translation', 'ipts' =3D> 'iptables', -'isdn' =3D> 'ISDN', -'isdn settings' =3D> 'Dodatkowe ustawienia ISDN:', -'isdn1' =3D> 'Pojedynczy ISDN', -'isdn2' =3D> 'Podw=C3=B3jny ISDN', 'january' =3D> 'Stycze=C5=84', 'javascript menu error1' =3D> 'Je=C5=BCeli rozwijane menu nie dzia=C5=82aj= =C4=85 poprawnie wy=C5=82=C4=85cz javascript na', 'javascript menu error2' =3D> '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' =3D> '=D0=A7=D0=B0=D1=81', 'hours' =3D> '=D0=A7=D0=B0=D1=81=D1=8B', 'hours2' =3D> '=D0=A7=D0=B0=D1=81=D1=8B', -'ibod for dual isdn only' =3D> 'iBOD can only be used with Dual ISDN.', 'icmp selected but no type' =3D> 'ICMP selected for protocol, but no ICMP ty= pe specified.', 'icmp type' =3D> 'ICMP Type', 'id' =3D> 'ID', @@ -1031,10 +1030,6 @@ 'iptmangles' =3D> 'IPTable Mangles', 'iptnats' =3D> 'IPTable Network Address Translation', 'ipts' =3D> 'iptables', -'isdn' =3D> 'ISDN', -'isdn settings' =3D> 'Additional ISDN settings:', -'isdn1' =3D> 'Single ISDN', -'isdn2' =3D> 'Dual ISDN', 'january' =3D> '=D0=AF=D0=BD=D0=B2=D0=B0=D1=80=D1=8C', 'javascript menu error1' =3D> 'If the drop down menus aren\'t working, disab= le javascript on the', 'javascript menu error2' =3D> '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' =3D> 'saat', 'hours' =3D> 'saat', 'hours2' =3D> 'saat', -'ibod for dual isdn only' =3D> 'iBOD yaln=C4=B1zca =C3=A7ift ISDN ile kullan= =C4=B1labilir.', 'icmp selected but no type' =3D> 'ICMP kural=C4=B1 i=C3=A7in se=C3=A7ildi an= cak ICMP t=C3=BCr=C3=BC belirtildi.', 'icmp type' =3D> 'ICMP T=C3=BCr=C3=BC', 'id' =3D> 'Kimlik Numaras=C4=B1 (ID)', @@ -1457,10 +1456,6 @@ 'iptmangles' =3D> 'IPTablo s=C4=B1k=C4=B1=C5=9Ft=C4=B1rmalar=C4=B1', 'iptnats' =3D> 'IPTablo a=C4=9F adres =C3=A7evrimi', 'ipts' =3D> 'IPTablolar', -'isdn' =3D> 'ISDN', -'isdn settings' =3D> 'Ek ISDN ayarlar=C4=B1:', -'isdn1' =3D> 'Tek ISDN', -'isdn2' =3D> '=C3=87ift ISDN', 'january' =3D> 'Ocak', 'javascript menu error1' =3D> 'E=C4=9Fer a=C5=9Fa=C4=9F=C4=B1 a=C3=A7=C4=B1l= =C4=B1r listeler =C3=A7al=C4=B1=C5=9Fm=C4=B1yorsa javascript se=C3=A7ene=C4= =9Fini devre d=C4=B1=C5=9F=C4=B1 b=C4=B1rak=C4=B1n', 'javascript menu error2' =3D> 'sayfa.', diff --git a/lfs/configroot b/lfs/configroot index ef92f5f08..2c09ae4a8 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -51,7 +51,7 @@ $(TARGET) : =20 # Create all directories for i in addon-lang auth backup ca captive certs connscheduler crls ddns dh= cp dhcpc dns dnsforward \ - ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist isdn key langs l= ogging mac main \ + ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist key langs loggin= g 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/s= ervers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_ni= cs ethernet/scanned_nics \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extra= hd/settings firewall/settings firewall/config firewall/locationblock firewall= /input firewall/outgoing \ fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts= /customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsett= ings 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/conf= ig ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advan= ced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/class= es 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 @@ =20 eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings) =20 -if [ "$TYPE" =3D "isdn" ]; then - DNS1=3D"${MS_DNS1}" - DNS2=3D"${MS_DNS2}" -fi - # Write DNS servers to configuration echo "${DNS1}" > /var/run/dns1 echo "${DNS2}" > /var/run/dns2 --=20 2.30.2 --===============6259697396796195016==--