version 1.14, 2003/05/27 13:16:44
|
version 1.23, 2007/04/13 18:37:27
|
Line 66 unless
|
Line 66 unless
|
{ |
{ |
print("**** ERROR **** Missing <TARGET />\n"); |
print("**** ERROR **** Missing <TARGET />\n"); |
} |
} |
|
<!-- Commented out by Matthew since MySQL insists on doing things its own way |
else # It exists, so look at the file metadata more closely. |
else # It exists, so look at the file metadata more closely. |
{ |
{ |
my @s = stat('<TARGET />'); |
my @s = stat('<TARGET />'); |
Line 105 else # It exists, so look at the file me
|
Line 106 else # It exists, so look at the file me
|
} |
} |
} |
} |
} |
} |
|
--> |
</perlscript> |
</perlscript> |
</file> |
</file> |
<file> |
<file> |
<target dist='default'>/etc/httpd/conf/loncapa.conf</target> |
<target dist='default'>/etc/httpd/conf/loncapa.conf</target> |
|
<target dist='sles10 suse10.1'>/etc/apache2/loncapa.conf</target> |
<perlscript mode='fg'> |
<perlscript mode='fg'> |
open IN, "<<TARGET />"; |
open IN, "<<TARGET />"; |
my $hbug=-1; |
my $hbug=-1; |
Line 117 while (<IN>) {
|
Line 120 while (<IN>) {
|
if (/PerlSetVar\s+lonHostID\s+(\S+)/) { |
if (/PerlSetVar\s+lonHostID\s+(\S+)/) { |
my $v=$1; |
my $v=$1; |
$hbug=0; |
$hbug=0; |
$hbug=1 if $v=~/\W/; |
$hbug=1 if $v=~/[^\w.\-]/; |
$hbug=1 if $v=~/\_/; |
$hbug=1 if $v=~/_/; |
} |
} |
if (/PerlSetVar\s+lonDefDomain\s+(\S+)/) { |
if (/PerlSetVar\s+lonDefDomain\s+(\S+)/) { |
my $v=$1; |
my $v=$1; |
$dbug=0; |
$dbug=0; |
$dbug=1 if $v=~/\W/; |
$dbug=1 if $v=~/[^\w.\-]/; |
$dbug=1 if $v=~/\_/; |
$dbug=1 if $v=~/_/; |
# Avoid namespace conflicts under the web server's DocumentRoot. |
# Avoid namespace conflicts under the web server's DocumentRoot. |
my @badnames=('raw','userfiles','priv','adm','uploaded'); |
my @badnames=('raw','userfiles','priv','adm','uploaded'); |
foreach my $bad (@badnames) { |
foreach my $bad (@badnames) { |
Line 147 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; |
while (<IN>) { |
my %line; |
next if (/^(\#|\s*$)/); |
my $line=0; |
if (/\S/) { |
while (my $l = <IN>) { |
$rbug=1 if /\r/; |
$line++; |
my @a=split(/\:/,$_); |
next if ($l=~/^(\#|\s*$)/); |
$dbug=1 if $a[0]=~/\W/; |
if ($l=~/^\^/) { |
$dbug=1 if $a[0]=~/\_/; |
if ($l !~ /^\^[\w.\-]/) { |
$dbug=1 if $a[1]=~/\_/; |
$dns_bug = 1; |
$dbug=1 if $a[1]=~/\W/; |
push(@{$line{'dns'}},$line); |
$fbug=1 if (@a<5 || @a>6); |
} |
|
} elsif ($l=~/\S/) { |
|
if ($l=~/\r/) { $rbug=1; push(@{$line{'r'}},$line); } |
|
my @a=split(/:/,$l); |
|
if ($a[0]=~/[^\w\-.]/ || |
|
$a[1]=~/[^\w\-.]/ || |
|
$a[0]=~/\_/ || |
|
$a[1]=~/\_/ ) { $dbug=1; push(@{$line{'d'}},$line); } |
|
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); } |
$a[4] =~ /$expr/ ) |
|
; |
; |
} |
} |
} |
} |
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 5 or 6 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"; |
|
} |
|
if ($dns_bug) { |
|
print "**** ERROR **** <TARGET /> host.tab server entry has characters (lines ".join(', ',@{$line{'dns'}}).")\n"; |
} |
} |
</file> |
</file> |
<file> |
<file> |
Line 186 open IN, "<<TARGET />";
|
Line 199 open IN, "<<TARGET />";
|
my $rbug=0; |
my $rbug=0; |
my $dbug=0; |
my $dbug=0; |
my $sbug=0; |
my $sbug=0; |
while (<IN>) { |
while (my $line = <IN>) { |
if (/\S/) { |
if ($line =~ /\S/) { |
$rbug=1 if /\r/; |
$rbug=1 if $line=~/\r/; |
$dbug=1 if $_=~/\W.*\n$/; |
if ($line =~ /\W.*\n/) { |
$dbug=1 if $_=~/\_/; |
$dbug=$line if ($line !~/\w:(?:primary|default)$/); |
$sbug=1 if /\s.+$/; |
} |
|
$dbug=$line if $line=~/\_/; |
|
$sbug=1 if $line=~/\s.+$/; |
} |
} |
} |
} |
close IN; |
close IN; |
Line 199 if ($rbug) {
|
Line 214 if ($rbug) {
|
print "**** ERROR **** <TARGET /> is DOS-formatted\n"; |
print "**** ERROR **** <TARGET /> is DOS-formatted\n"; |
} |
} |
if ($dbug) { |
if ($dbug) { |
print "**** ERROR **** <TARGET /> has invalid host id\n"; |
print "**** ERROR **** <TARGET /> has invalid host id ($dbug)\n"; |
} |
} |
if ($sbug) { |
if ($sbug) { |
print "**** ERROR **** <TARGET /> has illegal whitespace character\n"; |
print "**** ERROR **** <TARGET /> has illegal whitespace character\n"; |