--- loncom/lond	2002/08/22 21:37:35	1.92
+++ loncom/lond	2002/09/09 14:04:02	1.95
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.92 2002/08/22 21:37:35 albertel Exp $
+# $Id: lond,v 1.95 2002/09/09 14:04:02 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,9 +107,8 @@ $SIG{'QUIT'}=\&catchexception;
 $SIG{__DIE__}=\&catchexception;
 
 # ---------------------------------- Read loncapa_apache.conf and loncapa.conf
-&status("Read loncapa_apache.conf and loncapa.conf");
-my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf',
-                                                 'loncapa.conf');
+&status("Read loncapa.conf and loncapa_apache.conf");
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
 my %perlvar=%{$perlvarref};
 undef $perlvarref;
 
@@ -501,6 +500,8 @@ sub make_new_child {
 # =============================================================================
             # do something with the connection
 # -----------------------------------------------------------------------------
+	    $client->sockopt(SO_KEEPALIVE, 1);# Enable monitoring of
+	                                      # connection liveness.
             # see if we know client and check for spoof IP by challenge
             my $caller=getpeername($client);
             my ($port,$iaddr)=unpack_sockaddr_in($caller);
@@ -814,7 +815,8 @@ sub make_new_child {
 		       if ($udom ne $perlvar{'lonDefDomain'}) {
                            print $client "not_right_domain\n";
                        } else {
-			   &make_passwd_file($umode,$npass,$passfilename);
+			   my $result=&make_passwd_file($umode,$npass,
+							$passfilename);
 			   print $client $result;
                        }
 		     } else {