Fix parsing of more than one TLH in config.
The code introduced in 17ffbebad5
did not check the correct variable for being an array.
Improve an unrelated comment, too.
Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
parent
1fa9479946
commit
43a0fc7769
|
@ -78,7 +78,7 @@ my $TLH;
|
||||||
if ($Conf{'TLH'}) {
|
if ($Conf{'TLH'}) {
|
||||||
# $Conf{'TLH'} is parsed as an array by Config::Auto;
|
# $Conf{'TLH'} is parsed as an array by Config::Auto;
|
||||||
# make a flat list again, separated by :
|
# make a flat list again, separated by :
|
||||||
if (ref($TLH) eq 'ARRAY') {
|
if (ref($Conf{'TLH'}) eq 'ARRAY') {
|
||||||
$TLH = join(':',@{$Conf{'TLH'}});
|
$TLH = join(':',@{$Conf{'TLH'}});
|
||||||
} else {
|
} else {
|
||||||
$TLH = $Conf{'TLH'};
|
$TLH = $Conf{'TLH'};
|
||||||
|
@ -90,7 +90,7 @@ if ($Conf{'TLH'}) {
|
||||||
if ($TLH !~ /^[a-zA-Z0-9:]+$/);
|
if ($TLH !~ /^[a-zA-Z0-9:]+$/);
|
||||||
if ($TLH =~ /:/) {
|
if ($TLH =~ /:/) {
|
||||||
# reformat $TLH from a:b to (a)|(b),
|
# reformat $TLH from a:b to (a)|(b),
|
||||||
# e.g. replace '.' by '|'
|
# e.g. replace ':' by ')|('
|
||||||
$TLH =~ s/:/)|(/g;
|
$TLH =~ s/:/)|(/g;
|
||||||
$TLH = '(' . $TLH . ')';
|
$TLH = '(' . $TLH . ')';
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue