From 5f5c40b9b515a39a82e6b08308d97102eddc0934 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 3 Mar 2003 14:26:18 +0000
Subject: simplified code of adsl_ask_info, password can be retrieved using
 passwd_by_login which was not used with computed login from
 /etc/ppp/peers/adsl or /etc/ppp/options or /etc/ppp/options.adsl.

---
 perl-install/network/adsl.pm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index a46f58878..b94497d1f 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -78,12 +78,7 @@ sub adsl_ask_info {
 	next if $login && ! -r $_;
 	($login) = map { if_(/^user\s+\"([^\"]+)\"/, $1) } cat_($_);
     }
-    my $passwd = passwd_by_login($pppoe_conf{USER});
-    foreach (qw(/etc/ppp/pap-secrets /etc/ppp/chap-secrets)) {
-	next if $passwd && ! -r $_;
-	my $qlogin = quotemeta $login;
-	($passwd) = map { if_(/^(['"]?)$qlogin\1\s+\S+\s+(['"]?)(\S*)\2/, $3) } cat_($_);
-    }
+    my $passwd = passwd_by_login($login);
     $pppoe_conf{DNS1} ||= '';
     $pppoe_conf{DNS2} ||= '';
     add2hash($netc, { dnsServer2 => $pppoe_conf{DNS1}, dnsServer3 => $pppoe_conf{DNS2}, DOMAINNAME2 => '' });
-- 
cgit v1.2.1