diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-05-17 06:59:23 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-05-17 06:59:23 +0000 |
| commit | a6259ca7dac8ad2932b68a61cf142f0cfb698d8a (patch) | |
| tree | 9dac2fe8a73ea4ff25b9017fdf84ecef0dc6572a | |
| parent | b132e2faa3faaabbbd965ebb1afc508ef9ecef0b (diff) | |
| download | drakx-a6259ca7dac8ad2932b68a61cf142f0cfb698d8a.tar drakx-a6259ca7dac8ad2932b68a61cf142f0cfb698d8a.tar.gz drakx-a6259ca7dac8ad2932b68a61cf142f0cfb698d8a.tar.bz2 drakx-a6259ca7dac8ad2932b68a61cf142f0cfb698d8a.tar.xz drakx-a6259ca7dac8ad2932b68a61cf142f0cfb698d8a.zip | |
keep # and * characters in phone number (#16031)
| -rw-r--r-- | perl-install/network/modem.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm index 62dcd6a99..6359069eb 100644 --- a/perl-install/network/modem.pm +++ b/perl-install/network/modem.pm @@ -41,7 +41,7 @@ sub ppp_read_conf { ($modem->{dns1}, $modem->{dns2}) = split(',', $l{DNS}); foreach (cat_("/etc/sysconfig/network-scripts/chat-ppp0")) { - /.*ATDT(\d*)/ and $modem->{phone} ||= $1; + /.*ATDT([\d#*]*)/ and $modem->{phone} ||= $1; } foreach (cat_("/etc/sysconfig/network-scripts/ifcfg-ppp0")) { /NAME=(['"]?)(.*)\1/ and $modem->{login} ||= $2; @@ -81,7 +81,7 @@ sub ppp_configure { } my %toreplace = map { $_ => $modem->{$_} } qw(Authentication AutoName connection dns1 dns2 domain IPAddr login passwd phone SubnetMask); - $toreplace{phone} =~ s/\D//g; + $toreplace{phone} =~ s/[^\d#*]//g; if ($modem->{auto_dns} ne N("Automatic")) { $toreplace{dnsserver} = join ',', map { $modem->{$_} } "dns1", "dns2"; $toreplace{dnsserver} .= $toreplace{dnsserver} && ','; |