version 1.14, 2003/05/27 13:16:44
|
version 1.21, 2006/10/05 18:20:23
|
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 156 while (<IN>) {
|
Line 159 while (<IN>) {
|
$dbug=1 if $a[0]=~/\_/; |
$dbug=1 if $a[0]=~/\_/; |
$dbug=1 if $a[1]=~/\_/; |
$dbug=1 if $a[1]=~/\_/; |
$dbug=1 if $a[1]=~/\W/; |
$dbug=1 if $a[1]=~/\W/; |
$fbug=1 if (@a<5 || @a>6); |
$fbug=1 if (@a<4 || @a>5); |
my $expr='\s.+$'; |
my $expr='\s.+$'; |
$sbug=1 if ($a[0] =~ /$expr/ || |
$sbug=1 if ($a[0] =~ /$expr/ || |
$a[1] =~ /$expr/ || |
$a[1] =~ /$expr/ || |
$a[2] =~ /$expr/ || |
$a[2] =~ /$expr/ || |
$a[3] =~ /$expr/ || |
$a[3] =~ /$expr/ ) |
$a[4] =~ /$expr/ ) |
|
; |
; |
} |
} |
} |
} |
Line 174 if ($dbug) {
|
Line 176 if ($dbug) {
|
print "**** ERROR **** <TARGET /> has invalid host id or domain id\n"; |
print "**** ERROR **** <TARGET /> has invalid host id or domain id\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\n"; |
} |
} |
if ($sbug) { |
if ($sbug) { |
print "**** ERROR **** <TARGET /> has illegal whitespace character\n"; |
print "**** ERROR **** <TARGET /> has illegal whitespace character\n"; |
Line 186 open IN, "<<TARGET />";
|
Line 188 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 203 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"; |