--- doc/loncapafiles/sanitycheck.piml	2002/09/22 08:23:26	1.6
+++ doc/loncapafiles/sanitycheck.piml	2003/01/07 21:12:54	1.12
@@ -3,7 +3,7 @@
 <!-- sanitycheck.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: sanitycheck.piml,v 1.6 2002/09/22 08:23:26 harris41 Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.12 2003/01/07 21:12:54 harris41 Exp $ -->
 
 <!--
 
@@ -33,6 +33,33 @@ 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>
 <perlscript mode='fg'>
 unless
@@ -52,30 +79,30 @@ else # It exists, so look at the file me
       {
 	print('**** ERROR **** <TARGET /> should be owned by'.
 	      ' www.'."\n".'Try these commands to make things right:'."\n".
-	      'chown www:www /var/lib/mysql/mysql.sock'."\n".
-	      'chmod a-rwx,u+rwx /var/lib/mysql/mysql.sock'."\n");
+	      'chown www:www <TARGET />'."\n".
+	      'chmod a-rwx,u+rwx <TARGET />'."\n");
       }
-    else # Check permissions on the file to make sure it is private to apache2.
+    else # Check permissions on the file to make sure it is private to www.
       {
 	$smode =~ /^.(.)..$/;
 	my $wflag = $1;
-	if ($wflag != 7)
+	if ($wflag != 7) # Can www use this socket?  (Hope so!)
 	  {
 	    print('**** ERROR **** '.
 	      '<TARGET /> should be user "rwx" (by'.
 	      ' www).'."\n".'Try these commands to make things right:'."\n".
-	      'chown www:www /var/lib/mysql/mysql.sock'."\n".
-	      'chmod a-rwx,u+rwx /var/lib/mysql/mysql.sock'."\n");
+	      'chown www:www <TARGET />'."\n".
+	      'chmod a-rwx,u+rwx <TARGET />'."\n");
 	  }
 	$smode=~/^..(..)$/;
 	$wflag=$1;
-	if ($wflag ne "00")
+	if ($wflag ne "00") # Can others use this socket?  (Hope not!)
 	  {
 	    print('**** ERROR **** '.
 	      '<TARGET /> should not be group or everybody accessible'.
 	      '.'."\n".'Try these commands to make things right:'."\n".
-	      'chown www:www /var/lib/mysql/mysql.sock'."\n".
-	      'chmod a-rwx,u+rwx /var/lib/mysql/mysql.sock'."\n");
+	      'chown www:www <TARGET />'."\n".
+	      'chmod a-rwx,u+rwx <TARGET />'."\n");
 	  }
       }
   }
@@ -122,6 +149,7 @@ 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(/\:/,$_);