From 29e94f03ce0828add55b9f52c685d85e6f3e7d58 Mon Sep 17 00:00:00 2001
From: Frederic Lepied <flepied@mandriva.com>
Date: Wed, 5 Mar 2003 22:40:55 +0000
Subject: read login name from net_cnx_up in pptp mode.

---
 perl-install/network/adsl.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'perl-install/network')

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index b94497d1f..a09f58ee3 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -72,12 +72,14 @@ If you don't know, choose 'use pppoe'"), $l) or return;
 sub adsl_ask_info {
     my ($adsl, $netc, $_intf, $adsl_type) = @_;
     my $pppoe_file = "/etc/ppp/pppoe.conf";
+    my $pptp_file = '/etc/sysconfig/network-scripts/net_cnx_up';
     my %pppoe_conf; %pppoe_conf = getVarsFromSh($pppoe_file) if $adsl_type =~ /pppoe/ && -f $pppoe_file;
     my $login = $pppoe_conf{USER};
     foreach (qw(/etc/ppp/peers/adsl /etc/ppp/options /etc/ppp/options.adsl)) {
 	next if $login && ! -r $_;
 	($login) = map { if_(/^user\s+\"([^\"]+)\"/, $1) } cat_($_);
     }
+    ($login) = map { if_(/\sname\s+([^ \n]+)/, $1) } cat_($pptp_file) if $adsl_type =~ /pptp/ && -r $pptp_file;
     my $passwd = passwd_by_login($login);
     $pppoe_conf{DNS1} ||= '';
     $pppoe_conf{DNS2} ||= '';
-- 
cgit v1.2.1