summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-23 08:26:00 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-23 08:26:00 +0000
commitfbec5aacf2dba0552c020eb826ccac4cb0227716 (patch)
treee5025eb2584cda5817672e11349f7b1474d85bd6
parentac806ad828f60b4373b5f934e5a1d21b9bdb586d (diff)
downloaddrakx-fbec5aacf2dba0552c020eb826ccac4cb0227716.tar
drakx-fbec5aacf2dba0552c020eb826ccac4cb0227716.tar.gz
drakx-fbec5aacf2dba0552c020eb826ccac4cb0227716.tar.bz2
drakx-fbec5aacf2dba0552c020eb826ccac4cb0227716.tar.xz
drakx-fbec5aacf2dba0552c020eb826ccac4cb0227716.zip
read ppp auth method
-rwxr-xr-xperl-install/standalone/drakconnect6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 31465e377..25477d3d6 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -267,7 +267,7 @@ sub build_tree {
($intf->{dns1}, $intf->{dns2}) = split(',', $l{DNS});
$intf->{$_->[0]} = $l{$_->[1]} foreach [ 'connection' , 'Name' ], [ 'domain', 'Domain' ], [ 'login', 'Username' ],
[ 'Timeout', 'Timeout' ], [ 'UseLockFile', 'UseLockFile' ], [ 'BusyWait', 'BusyWait' ],
- [ 'FlowControl', 'FlowControl' ], [ 'Speed', 'Speed' ];
+ [ 'FlowControl', 'FlowControl' ], [ 'Speed', 'Speed' ], [ 'Authentication', 'Authentication' ];
/.*ATDT(\d*)/ and $intf->{phone} = $1 foreach cat_("/etc/sysconfig/network-scripts/chat-ppp0");
/NAME=(['"]?)(.*)\1/ and $intf->{login} ||= $2 foreach cat_("/etc/sysconfig/network-scripts/ifcfg-ppp0");
$_->{login} eq $intf->{login} and $intf->{passwd} = $_->{passwd} foreach @{network::tools::read_secret_backend()};
@@ -440,7 +440,9 @@ sub build_notebook {
if_($interface =~ /^(isdn|modem)$/, [ N("Provider phone number"), $1 eq 'modem' ? 'phone' : 'phone_out' ]),
),
);
- $gui->{intf}{auth}->set_popdown_strings(N("PAP"), N("Terminal-based"), N("Script-based"), N("CHAP"), N("PAP/CHAP"));
+ my %auth_methods = map_index { $::i => $_ } N("PAP"), N("Terminal-based"), N("Script-based"), N("CHAP"), N("PAP/CHAP");
+ $gui->{intf}{auth}->set_popdown_strings(values %auth_methods);
+ $gui->{intf}{auth}->set_text($auth_methods{$intf->{Authentication}});
$gui->{intf}{passwd}->set_visibility(0);
}