--- loncom/production_dns_sanity.pl	2008/05/20 15:43:12	1.1
+++ loncom/production_dns_sanity.pl	2008/05/20 15:50:47	1.2
@@ -12,6 +12,9 @@ while (my $line=<IN>) {
    chomp($line);
    unless ($line=~/\S/) { next; }
    my ($domain,$name,$auth,$authparm,$lang,$city,$coord1,$coord2,$lib)=split(/\:/,$line);
+   if ($domserv{$domain}) {
+      print "Domain $domain defined more than once in domain.tab\n";
+   }
    $domserv{$domain}=$lib;
    $domname{$domain}=$name;
 }
@@ -40,3 +43,14 @@ foreach my $dom (keys %domserv) {
        print "$domserv{$dom} is not a library server ($hostfunc{$domserv{$dom}})\n";
     }
 }
+
+# Every server should have a valid domain
+
+foreach my $serv (keys %hostdom) {
+   unless ($domserv{$hostdom{$serv}}) {
+      print "Server $serv has invalid domain in hosts.tab\n";
+   }
+   unless (($hostfunc{$serv} eq 'library') || ($hostfunc{$serv} eq 'access')) {
+      print "Server $serv has invalid function $hostfunc{$serv} in hosts.tab\n";
+   }
+}