--- doc/loncapafiles/sanitycheck.piml	2002/11/26 15:05:19	1.9
+++ doc/loncapafiles/sanitycheck.piml	2006/12/10 23:23:55	1.22
@@ -1,9 +1,8 @@
 <!DOCTYPE piml PUBLIC "-//TUX/DTD piml 1.0 Final//EN" 
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
-<!-- Scott Harrison -->
 
-<!-- $Id: sanitycheck.piml,v 1.9 2002/11/26 15:05:19 matthew Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.22 2006/12/10 23:23:55 albertel Exp $ -->
 
 <!--
 
@@ -33,14 +32,41 @@ http://www.lon-capa.org/
 <targetroot>/</targetroot>
 <files>
 <file>
+<target dist='default'>/etc/hosts</target>
+<perlscript mode='fg'>
+unless
+    (-e '<TARGET />') # Does file exist?
+  {
+    print("**** ERROR **** Missing <TARGET />\n");
+  }
+else
+  {
+    my $numentries = `grep -v '^#' <TARGET /> | grep -c '[[:alpha:]]'`;
+    if ($numentries == 1)
+      {
+        print("**** ERROR **** Malformatted <TARGET />\n");
+        print("<TARGET /> typically should have at least two entries, ".
+	      "e.g.:\n");
+	print("127.0.0.1               localhost.localdomain localhost\n");
+	print("35.8.63.26              s16.lite.msu.edu s16\n");
+        print("The <TARGET /> file on your machine looks like it was \n".
+	      "messed up due to a common bug with RedHat installations.\n".
+	      "(This weird bug is RedHat's fault, not LON-CAPA's.)\n");
+        print("Please read the man pages about \"hosts\" and fix your\n".
+	      "<TARGET /> file.\n");
+      }
+  }
+</perlscript>
+</file>
+<file>
 <target dist='default'>/var/lib/mysql/mysql.sock</target>
-<target dist='redhat7'>/tmp/mysql.sock</target>
 <perlscript mode='fg'>
 unless
     (-e '<TARGET />') # Does file exist?
   {
     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.
   {
     my @s = stat('<TARGET />');
@@ -51,7 +77,7 @@ else # It exists, so look at the file me
 
     if ($uid ne $web_uid) # If file owned by someone else other than www.
       {
-	print('**** ERROR **** <TARGET /> should be owned by'.
+	print('**** WARNING **** <TARGET /> should be owned by'.
 	      ' www.'."\n".'Try these commands to make things right:'."\n".
 	      'chown www:www <TARGET />'."\n".
 	      'chmod a-rwx,u+rwx <TARGET />'."\n");
@@ -62,7 +88,7 @@ else # It exists, so look at the file me
 	my $wflag = $1;
 	if ($wflag != 7) # Can www use this socket?  (Hope so!)
 	  {
-	    print('**** ERROR **** '.
+	    print('**** WARNING **** '.
 	      '<TARGET /> should be user "rwx" (by'.
 	      ' www).'."\n".'Try these commands to make things right:'."\n".
 	      'chown www:www <TARGET />'."\n".
@@ -72,7 +98,7 @@ else # It exists, so look at the file me
 	$wflag=$1;
 	if ($wflag ne "00") # Can others use this socket?  (Hope not!)
 	  {
-	    print('**** ERROR **** '.
+	    print('**** WARNING **** '.
 	      '<TARGET /> should not be group or everybody accessible'.
 	      '.'."\n".'Try these commands to make things right:'."\n".
 	      'chown www:www <TARGET />'."\n".
@@ -80,10 +106,12 @@ else # It exists, so look at the file me
 	  }
       }
   }
+ -->
 </perlscript>
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/loncapa.conf</target>
+<target dist='sles10 suse10.1'>/etc/apache2/loncapa.conf</target>
 <perlscript mode='fg'>
 open IN, "&lt;<TARGET />";
 my $hbug=-1;
@@ -122,36 +150,39 @@ my $rbug=0;
 my $dbug=0;
 my $sbug=0;
 my $fbug=0;
+my %line;
+my $line=0;
 while (&lt;IN&gt;) {
+ $line++;
+ next if (/^(\#|\s*$)/);
  if (/\S/) {
-  $rbug=1 if /\r/;
+  if (/\r/) {              $rbug=1; push(@{$line{'r'}},$line); }
   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<5 || @a>6);
+  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.+$';
-  $sbug=1 if ($a[0] =~ /$expr/ ||
-	      $a[1] =~ /$expr/ ||
-	      $a[2] =~ /$expr/ ||
-	      $a[3] =~ /$expr/ ||
-	      $a[4] =~ /$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 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) {
-  print "**** ERROR **** <TARGET /> has illegal whitespace character\n";
+  print "**** ERROR **** <TARGET /> has illegal whitespace character (lines ".join(', ',@{$line{'s'}}).")\n";
 }
 </file>
 <file>
@@ -160,12 +191,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;
@@ -173,7 +206,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";