--- doc/loncapafiles/sanitycheck.piml	2003/01/07 21:12:54	1.12
+++ doc/loncapafiles/sanitycheck.piml	2006/10/05 18:20:23	1.21
@@ -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.12 2003/01/07 21:12:54 harris41 Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.21 2006/10/05 18:20:23 raeburn Exp $ -->
 
 <!--
 
@@ -67,6 +66,7 @@ unless
   {
     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 />');
@@ -77,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");
@@ -88,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".
@@ -98,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".
@@ -106,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;
@@ -157,13 +159,12 @@ while (&lt;IN&gt;) {
   $dbug=1 if $a[0]=~/\_/;
   $dbug=1 if $a[1]=~/\_/;
   $dbug=1 if $a[1]=~/\W/;
-  $fbug=1 if (@a<5 || @a>6);
+  $fbug=1 if (@a<4 || @a>5);
   my $expr='\s.+$';
   $sbug=1 if ($a[0] =~ /$expr/ ||
 	      $a[1] =~ /$expr/ ||
 	      $a[2] =~ /$expr/ ||
-	      $a[3] =~ /$expr/ ||
-	      $a[4] =~ /$expr/ )
+	      $a[3] =~ /$expr/ )
 ;
  }
 }
@@ -175,7 +176,7 @@ if ($dbug) {
   print "**** ERROR **** <TARGET /> has invalid host id or domain id\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\n";
 }
 if ($sbug) {
   print "**** ERROR **** <TARGET /> has illegal whitespace character\n";
@@ -187,12 +188,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;
@@ -200,7 +203,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";