version 1.18, 2006/09/28 02:15:06
|
version 1.22, 2006/12/10 23:23:55
|
Line 111 else # It exists, so look at the file me
|
Line 111 else # It exists, so look at the file me
|
</file> |
</file> |
<file> |
<file> |
<target dist='default'>/etc/httpd/conf/loncapa.conf</target> |
<target dist='default'>/etc/httpd/conf/loncapa.conf</target> |
<target dist='suse9.3 suse9.2 sles9'>/etc/httpd/loncapa.conf</target> |
<target dist='sles10 suse10.1'>/etc/apache2/loncapa.conf</target> |
<target dist='sles10'>/etc/apache2/loncapa.conf</target> |
|
<perlscript mode='fg'> |
<perlscript mode='fg'> |
open IN, "<<TARGET />"; |
open IN, "<<TARGET />"; |
my $hbug=-1; |
my $hbug=-1; |
Line 151 my $rbug=0;
|
Line 150 my $rbug=0;
|
my $dbug=0; |
my $dbug=0; |
my $sbug=0; |
my $sbug=0; |
my $fbug=0; |
my $fbug=0; |
|
my %line; |
|
my $line=0; |
while (<IN>) { |
while (<IN>) { |
|
$line++; |
next if (/^(\#|\s*$)/); |
next if (/^(\#|\s*$)/); |
if (/\S/) { |
if (/\S/) { |
$rbug=1 if /\r/; |
if (/\r/) { $rbug=1; push(@{$line{'r'}},$line); } |
my @a=split(/\:/,$_); |
my @a=split(/\:/,$_); |
$dbug=1 if $a[0]=~/\W/; |
if ($a[0]=~/[^\w\-.]/ || |
$dbug=1 if $a[0]=~/\_/; |
$a[1]=~/[^\w\-.]/ || |
$dbug=1 if $a[1]=~/\_/; |
$a[0]=~/\_/ || |
$dbug=1 if $a[1]=~/\W/; |
$a[1]=~/\_/ ) { $dbug=1; push(@{$line{'d'}},$line); } |
$fbug=1 if (@a<4 || @a>5); |
if (@a<4 || @a>5) { $fbug=1; push(@{$line{'f'}},$line); } |
my $expr='\s.+$'; |
my $expr='\s.+$'; |
$sbug=1 if ($a[0] =~ /$expr/ || |
if ($a[0] =~ /$expr/ || |
$a[1] =~ /$expr/ || |
$a[1] =~ /$expr/ || |
$a[2] =~ /$expr/ || |
$a[2] =~ /$expr/ || |
$a[3] =~ /$expr/ ) |
$a[3] =~ /$expr/ ) { $sbug=1; push(@{$line{'s'}},$line); } |
; |
; |
} |
} |
} |
} |
close IN; |
close IN; |
if ($rbug) { |
if ($rbug) { |
print "**** ERROR **** <TARGET /> is DOS-formatted\n"; |
print "**** ERROR **** <TARGET /> is DOS-formatted (lines ".join(', ',@{$line{'r'}}).")\n"; |
} |
} |
if ($dbug) { |
if ($dbug) { |
print "**** ERROR **** <TARGET /> has invalid host id or domain id\n"; |
print "**** ERROR **** <TARGET /> has invalid host id or domain id (lines ".join(', ',@{$line{'d'}}).")\n"; |
} |
} |
if ($fbug) { |
if ($fbug) { |
print "**** ERROR **** <TARGET /> is lacking 4 or 5 columns for every row\n"; |
print "**** ERROR **** <TARGET /> is lacking 4 or 5 columns for every row (lines ".join(', ',@{$line{'f'}}).")\n"; |
} |
} |
if ($sbug) { |
if ($sbug) { |
print "**** ERROR **** <TARGET /> has illegal whitespace character\n"; |
print "**** ERROR **** <TARGET /> has illegal whitespace character (lines ".join(', ',@{$line{'s'}}).")\n"; |
} |
} |
</file> |
</file> |
<file> |
<file> |
Line 192 my $sbug=0;
|
Line 194 my $sbug=0;
|
while (my $line = <IN>) { |
while (my $line = <IN>) { |
if ($line =~ /\S/) { |
if ($line =~ /\S/) { |
$rbug=1 if $line=~/\r/; |
$rbug=1 if $line=~/\r/; |
if ($line =~ /\W/) { |
if ($line =~ /\W.*\n/) { |
$dbug=$line if ($line !~/\w:(?:primary|default)$/); |
$dbug=$line if ($line !~/\w:(?:primary|default)$/); |
} |
} |
$dbug=$line if $line=~/\_/; |
$dbug=$line if $line=~/\_/; |