summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/network/isdn.pm28
-rw-r--r--perl-install/network/netconnect.pm4
-rw-r--r--perl-install/network/tools.pm4
3 files changed, 18 insertions, 18 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index d488d35d8..2b747e255 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -169,7 +169,7 @@ sub isdn_read_config {
}
NEXT:
foreach my $f ('isdn1B.conf', 'isdn2B.conf') {
- foreach (cat_ ("$prefix/etc/isdn/$f")) {
+ foreach (cat_("$prefix/etc/isdn/$f")) {
/^\s*EAZ\s*=\s*(.*)/ and $isdn->{phone_in} = $1;
/^\s*PHONE_OUT\s*=\s*(.*)/ and $isdn->{phone_out} = $1;
if (/^\s*NAME\s*=\s*ippp0/ .. /PPPBIND\s*=\s*0/) {
@@ -178,22 +178,22 @@ sub isdn_read_config {
}
}
} else {
- my %match = (I4L_USERNAME => login,
- I4L_LOCALMSN => phone_in,
- I4L_REMOTE_OUT => phone_out,
- I4L_DIALMODE => dialing_mode,
- I4L_MODULE => driver,
- I4L_TYPE => type,
- I4L_IRQ => irq,
- I4L_MEMBASE => mem,
- I4L_PORT => io,
- I4L_IO0 => io0,
- I4L_IO1 => io1,
- I4L_FIRMWARE => firmware);
+ my %match = (I4L_USERNAME => 'login',
+ I4L_LOCALMSN => 'phone_in',
+ I4L_REMOTE_OUT => 'phone_out',
+ I4L_DIALMODE => 'dialing_mode',
+ I4L_MODULE => 'driver',
+ I4L_TYPE => 'type',
+ I4L_IRQ => 'irq',
+ I4L_MEMBASE => 'mem',
+ I4L_PORT => 'io',
+ I4L_IO0 => 'io0',
+ I4L_IO1 => 'io1',
+ I4L_FIRMWARE => 'firmware');
foreach ('link/myisp', 'card/mycard') {
my %conf = getVarsFromSh("$prefix/etc/isdn/profile/$_");
foreach (keys %conf) {
- $isdn->{$match{"$_"}} = $conf{"$_"} if $match{$_};
+ $isdn->{$match{$_}} = $conf{$_} if $match{$_};
}
}
}
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index f3da861c4..d43b22bfa 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -398,7 +398,7 @@ PPPConnectionName=$modem->{connection}
PPPProviderDomain=$modem->{domain}
PPPLogin=$modem->{login}
PPPAuthentication=$modem->{auth}
-PPPSpecialCommand=" . ($netcnx->{type} eq 'isdn_external' ? $netcnx->{isdn_external}{special_command} : '') if ($conf{modem});
+PPPSpecialCommand=" . ($netcnx->{type} eq 'isdn_external' ? $netcnx->{isdn_external}{special_command} : '') if $conf{modem};
$str .= "
ADSLInterfacesList=
@@ -407,7 +407,7 @@ ADSLType=" . ($netcnx->{type} =~ /adsl/ ? $netcnx->{type} : '') . "
ADSLProviderDomain=$netc->{DOMAINNAME2}
ADSLLogin=$adsl->{login}
" . #ADSLPassword=$adsl->{passwd}
-"DOMAINNAME2=$netc->{DOMAINNAME2}" if ($conf{adsl});
+"DOMAINNAME2=$netc->{DOMAINNAME2}" if $conf{adsl};
output_with_perm("$prefix/etc/sysconfig/network-scripts/drakconnect_conf", 0600, $str);
my $a = $netcnx->{PROFILE} ? $netcnx->{PROFILE} : "default";
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index b654e87f1..489e0d966 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -35,7 +35,7 @@ sub write_secret_backend {
sub unquotify {
my ($word) = @_;
- ($a, $b, $c) = $$word =~ /"(.*)"|'(.*)'|(.*)/;
+ my ($a, $b, $c) = $$word =~ /"(.*)"|'(.*)'|(.*)/;
$$word = $a ? $a : $b ? $b : $c;
}
@@ -63,7 +63,7 @@ sub passwd_by_login {
unquotify \$login;
my $secret = read_secret_backend();
foreach (@$secret) {
- return $_->{passwd} if ($_->{login} eq $login);
+ return $_->{passwd} if $_->{login} eq $login;
}
}