Merge pull request #5695 from 3D-I/ticket/16161

[ticket/16161] Enable BBcodes without closing tag
handle more kppp options from new steps
author: Marc Alexander <admin@m-a-styles.de> 2019-10-26 21:50:43 +0200
committer: Marc Alexander <admin@m-a-styles.de> 2019-10-26 21:50:43 +0200
commit: 28fd9457e9c954dcaa956be58b6bc3d016800d2b (patch)
tree: 51873fb60859012f03c0df013f0f23f270807a1a /phpBB/phpbb/db/migration/data/v31x/v313rc1.php
parent: 6a7ed40b0500a79bd63679d22f67aa1762d95fde (diff)
parent: 813a55b01d5a81559d8b2d8fab45a4c6157a222a (diff)
download: forums-28fd9457e9c954dcaa956be58b6bc3d016800d2b.tar
forums-28fd9457e9c954dcaa956be58b6bc3d016800d2b.tar.gz
forums-28fd9457e9c954dcaa956be58b6bc3d016800d2b.tar.bz2
forums-28fd9457e9c954dcaa956be58b6bc3d016800d2b.tar.xz
forums-28fd9457e9c954dcaa956be58b6bc3d016800d2b.zip
0 files changed, 0 insertions, 0 deletions
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index 4407d64bf..57a420b95 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -18,7 +18,7 @@ sub ppp_configure {
 
     any::devfssymlinkf($modem, 'modem') if $modem->{device} ne "/dev/modem";
 
-    my %toreplace = map { $_ => $modem->{$_} } qw(connection phone login passwd auth domain dns1 dns2);
+    my %toreplace = map { $_ => $modem->{$_} } qw(auth AutoName connection dns1 dns2 domain IPAddr login passwd phone SubnetMask);
     $toreplace{kpppauth} = ${{ 'Script-based' => 0, 'PAP' => 1, 'Terminal-based' => 2, }}{$modem->{auth}};
     $toreplace{kpppauth} = ${{ 'Script-based' => 0, 'PAP' => 1, 'Terminal-based' => 2, 'CHAP' => 3 }}{$modem->{auth}};
     $toreplace{phone} =~ s/[a-zA-Z]//g;
@@ -33,6 +33,14 @@ sub ppp_configure {
     $toreplace{intf} ||= 'ppp0';
     $toreplace{papname} = ($modem->{auth} eq 'PAP' || $modem->{auth} eq 'CHAP') && $toreplace{login};
 
+    # handle static/dynamic settings:
+    if ($modem->{auto_ip}) {
+        $toreplace{$_} = '0.0.0.0' foreach qw(IPAddr SubnetMask) ;
+    }
+    $toreplace{DNS} if $modem->{auto_dns};
+    $toreplace{Gateway} = '0.0.0.0' if $modem->{auto_gateway};
+
+
     #- build ifcfg-ppp0.
     my $various = <<END;
 DEVICE="$toreplace{intf}"
@@ -119,7 +127,7 @@ END
 
 [Account0]
 ExDNSDisabled=0
-AutoName=0
+AutoName=$toreplace{AutoName}
 ScriptArguments=
 AccountingEnabled=0
 DialString=ATDT
@@ -135,11 +143,11 @@ Command=
 ScriptCommands=
 Authentication=$toreplace{kpppauth}
 DNS=$toreplace{dnsserver}
-SubnetMask=0.0.0.0
+SubnetMask=$toreplace{SubnetMask}
 AccountingFile=
 DefaultRoute=1
 Username=$toreplace{login}
-Gateway=0.0.0.0
+Gateway=$toreplace{Gateway}
 StorePassword=1
 DisconnectCommand=
author	Marc Alexander <admin@m-a-styles.de>	2019-10-26 21:50:43 +0200
committer	Marc Alexander <admin@m-a-styles.de>	2019-10-26 21:50:43 +0200
commit	28fd9457e9c954dcaa956be58b6bc3d016800d2b (patch)
tree	51873fb60859012f03c0df013f0f23f270807a1a /phpBB/phpbb/db/migration/data/v31x/v313rc1.php
parent	6a7ed40b0500a79bd63679d22f67aa1762d95fde (diff)
parent	813a55b01d5a81559d8b2d8fab45a4c6157a222a (diff)
download	forums-28fd9457e9c954dcaa956be58b6bc3d016800d2b.tar forums-28fd9457e9c954dcaa956be58b6bc3d016800d2b.tar.gz forums-28fd9457e9c954dcaa956be58b6bc3d016800d2b.tar.bz2 forums-28fd9457e9c954dcaa956be58b6bc3d016800d2b.tar.xz forums-28fd9457e9c954dcaa956be58b6bc3d016800d2b.zip