summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-20 15:00:25 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-20 15:00:25 +0000
commit8aee59ea79b874951355cabed05d0a472cfd5166 (patch)
tree8c2e10bf57f86ca3125fd547c3acc138fc39acf7
parent230bb22712362a82713bda106e212cfbfdeaf17e (diff)
downloaddrakx-8aee59ea79b874951355cabed05d0a472cfd5166.tar
drakx-8aee59ea79b874951355cabed05d0a472cfd5166.tar.gz
drakx-8aee59ea79b874951355cabed05d0a472cfd5166.tar.bz2
drakx-8aee59ea79b874951355cabed05d0a472cfd5166.tar.xz
drakx-8aee59ea79b874951355cabed05d0a472cfd5166.zip
- handle PAP/CHAP auth method too
- translate again strings
-rw-r--r--perl-install/network/modem.pm3
-rw-r--r--perl-install/network/netconnect.pm3
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index 57a420b95..aa6551b87 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -19,8 +19,7 @@ sub ppp_configure {
any::devfssymlinkf($modem, 'modem') if $modem->{device} ne "/dev/modem";
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{kpppauth} = ${{ N('Script-based') => 0, N('PAP') => 1, N('Terminal-based') => 2, N('CHAP') => 3, N('PAP/CHAP') => 4 }}{$modem->{auth}};
$toreplace{phone} =~ s/[a-zA-Z]//g;
$toreplace{dnsserver} = join ',', map { $modem->{$_} } "dns1", "dns2";
$toreplace{dnsserver} .= $toreplace{dnsserver} && ',';
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 328b5f67b..e0f26a22d 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -457,7 +457,8 @@ killall pppd
{ label => N("Phone number"), val => \$modem->{phone} },
{ label => N("Login ID"), val => \$modem->{login} },
{ label => N("Password"), val => \$modem->{passwd}, hidden => 1 },
- { label => N("Authentication"), val => \$modem->{auth}, list => [ N_("PAP"), N_("Terminal-based"), N_("Script-based"), N_("CHAP") ] },
+ { label => N("Authentication"), val => \$modem->{auth},
+ list => [ N("PAP"), N("Terminal-based"), N("Script-based"), N("CHAP"), N("PAP/CHAP") ] },
],
},
next => "ppp_ip",