--- loncom/loncron	2010/07/20 02:42:27	1.85
+++ loncom/loncron	2011/04/23 16:18:49	1.88
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.85 2010/07/20 02:42:27 raeburn Exp $
+# $Id: loncron,v 1.88 2011/04/23 16:18:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -691,7 +691,7 @@ sub write_loncaparevs {
         foreach my $id (sort(keys(%hostname))) {
             if ($id ne '') {
                 my $loncaparev = &Apache::lonnet::get_server_loncaparev('',$id,1,'loncron');
-                if ($loncaparev =~ /^[\d.\-]+$/) {
+                if ($loncaparev =~ /^[\w.\-]+$/) {
                     print $fh $id.':'.$loncaparev."\n";
                 }
             }
@@ -823,7 +823,7 @@ sub main () {
             close($fh);
             my $execpath = $perlvar{'lonDaemons'}.'/lciptables';
             system("$execpath $tmpfile");
-            unlink($fh);
+            unlink($tmpfile);
         }
     }
 
@@ -866,12 +866,10 @@ sub main () {
 	&check_delayed_msg($fh);
 	&finish_logging($fh);
 	&log_simplestatus();
-	
-	if ($totalcount>200 && !$noemail) { &send_mail(); }
-    }
-    if (!$justcheckconnections && !$justreload) {
         &write_loncaparevs();
         &write_serverhomeIDs();
+	
+	if ($totalcount>200 && !$noemail) { &send_mail(); }
     }
 }