--- doc/loncapafiles/sanitycheck.piml	2006/09/15 20:55:15	1.17
+++ doc/loncapafiles/sanitycheck.piml	2012/10/05 15:36:21	1.38
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
 
-<!-- $Id: sanitycheck.piml,v 1.17 2006/09/15 20:55:15 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.38 2012/10/05 15:36:21 raeburn Exp $ -->
 
 <!--
 
@@ -60,6 +60,8 @@ else
 </file>
 <file>
 <target dist='default'>/var/lib/mysql/mysql.sock</target>
+<target dist='suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>/var/run/mysql/mysql.sock</target>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/var/run/mysqld/mysqld.sock</target>
 <perlscript mode='fg'>
 unless
     (-e '<TARGET />') # Does file exist?
@@ -111,8 +113,7 @@ else # It exists, so look at the file me
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='suse9.3 suse9.2 sles9'>/etc/httpd/loncapa.conf</target>
-<target dist='sles10'>/etc/apache2/loncapa.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/loncapa.conf</target>
 <perlscript mode='fg'>
 open IN, "&lt;<TARGET />";
 my $hbug=-1;
@@ -121,14 +122,14 @@ while (&lt;IN&gt;) {
  if (/PerlSetVar\s+lonHostID\s+(\S+)/) {
   my $v=$1;
   $hbug=0;
-  $hbug=1 if $v=~/\W/;
-  $hbug=1 if $v=~/\_/;
+  $hbug=1 if $v=~/[^\w.\-]/;
+  $hbug=1 if $v=~/_/;
  }
  if (/PerlSetVar\s+lonDefDomain\s+(\S+)/) {
   my $v=$1;
   $dbug=0;
-  $dbug=1 if $v=~/\W/;
-  $dbug=1 if $v=~/\_/;
+  $dbug=1 if $v=~/[^\w.\-]/;
+  $dbug=1 if $v=~/_/;
   # Avoid namespace conflicts under the web server's DocumentRoot.
   my @badnames=('raw','userfiles','priv','adm','uploaded');
   foreach my $bad (@badnames) {
@@ -151,36 +152,47 @@ my $rbug=0;
 my $dbug=0;
 my $sbug=0;
 my $fbug=0;
-while (&lt;IN&gt;) {
- next if (/^(\#|\s*$)/);
- if (/\S/) {
-  $rbug=1 if /\r/;
-  my @a=split(/\:/,$_);
-  $dbug=1 if $a[0]=~/\W/;
-  $dbug=1 if $a[0]=~/\_/;
-  $dbug=1 if $a[1]=~/\_/;
-  $dbug=1 if $a[1]=~/\W/;
-  $fbug=1 if (@a<4 || @a>5);
+my %line;
+my $line=0;
+while (my $l = &lt;IN&gt;) {
+ $line++;
+ next if ($l=~/^(\#|\s*$)/);
+ if ($l=~/^\^/) {
+  if ($l !~ /^\^[\w.\-]/) {
+    $dns_bug = 1;
+    push(@{$line{'dns'}},$line);
+  }
+ } 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<6 || @a>6) {      $fbug=1; push(@{$line{'f'}},$line); }
   my $expr='\s.+$';
-  $sbug=1 if ($a[0] =~ /$expr/ ||
-	      $a[1] =~ /$expr/ ||
-	      $a[2] =~ /$expr/ ||
-	      $a[3] =~ /$expr/ )
+  if ($a[0] =~ /$expr/ ||
+      $a[1] =~ /$expr/ ||
+      $a[2] =~ /$expr/ ||
+      $a[3] =~ /$expr/ ) { $sbug=1; push(@{$line{'s'}},$line); }
 ;
  }
 }
 close IN;
 if ($rbug) {
-  print "**** ERROR **** <TARGET /> is DOS-formatted\n";
+  print "**** ERROR **** <TARGET /> is DOS-formatted (lines ".join(', ',@{$line{'r'}}).")\n";
 }
 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) {
-  print "**** ERROR **** <TARGET /> is lacking 4 or 5 columns for every row\n";
+  print "**** ERROR **** <TARGET /> is lacking 6 columns for every row (lines ".join(', ',@{$line{'f'}}).")\n";
 }
 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>
@@ -189,12 +201,14 @@ open IN, "&lt;<TARGET />";
 my $rbug=0;
 my $dbug=0;
 my $sbug=0;
-while (&lt;IN&gt;) {
- if (/\S/) {
-  $rbug=1 if /\r/;
-  $dbug=1 if $_=~/\W.*\n$/;
-  $dbug=1 if $_=~/\_/;
-  $sbug=1 if /\s.+$/;
+while (my $line = &lt;IN&gt;) {
+ if ($line =~ /\S/) {
+  $rbug=1 if $line=~/\r/;
+  if ($line =~ /\W.*\n/) {
+	$dbug=$line if ($line !~/\w:(?:primary|default)$/);
+  }
+  $dbug=$line if $line=~/\_/;
+  $sbug=1 if $line=~/\s.+$/;
  }
 }
 close IN;
@@ -202,7 +216,7 @@ if ($rbug) {
   print "**** ERROR **** <TARGET /> is DOS-formatted\n";
 }
 if ($dbug) {
-  print "**** ERROR **** <TARGET /> has invalid host id\n";
+  print "**** ERROR **** <TARGET /> has invalid host id ($dbug)\n";
 }
 if ($sbug) {
   print "**** ERROR **** <TARGET /> has illegal whitespace character\n";