--- doc/loncapafiles/sanitycheck.piml	2002/08/15 15:41:57	1.4
+++ doc/loncapafiles/sanitycheck.piml	2003/02/03 18:03:51	1.13
@@ -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.4 2002/08/15 15:41:57 harris41 Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.13 2003/02/03 18:03:51 harris41 Exp $ -->
 
 <!--
 
@@ -33,6 +32,82 @@ 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
+    (-e '<TARGET />') # Does file exist?
+  {
+    print("**** ERROR **** Missing <TARGET />\n");
+  }
+else # It exists, so look at the file metadata more closely.
+  {
+    my @s = stat('<TARGET />');
+    my $uid = $s[4];
+    my $mode = $s[2];
+    my $web_uid = getpwnam('www');
+    my $smode = sprintf("%04o",$mode & 07777);
+
+    if ($uid ne $web_uid) # If file owned by someone else other than www.
+      {
+	print('**** ERROR **** <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");
+      }
+    else # Check permissions on the file to make sure it is private to www.
+      {
+	$smode =~ /^.(.)..$/;
+	my $wflag = $1;
+	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 <TARGET />'."\n".
+	      'chmod a-rwx,u+rwx <TARGET />'."\n");
+	  }
+	$smode=~/^..(..)$/;
+	$wflag=$1;
+	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 <TARGET />'."\n".
+	      'chmod a-rwx,u+rwx <TARGET />'."\n");
+	  }
+      }
+  }
+</perlscript>
+</file>
+<file>
 <target dist='default'>/etc/httpd/conf/loncapa.conf</target>
 <perlscript mode='fg'>
 open IN, "&lt;<TARGET />";
@@ -50,6 +125,11 @@ while (&lt;IN&gt;) {
   $dbug=0;
   $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) {
+   $dbug=1 if $v eq $bad;
+  }
  }
 }
 if ($hbug) {
@@ -68,6 +148,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(/\:/,$_);