--- loncom/lond	2002/08/22 20:00:00	1.91
+++ loncom/lond	2002/09/16 13:26:21	1.97
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.91 2002/08/22 20:00:00 albertel Exp $
+# $Id: lond,v 1.97 2002/09/16 13:26:21 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,6 +83,68 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
+#
+#  The array below are password error strings."
+#
+my $lastpwderror    = 13;		# Largest error number from lcpasswd.
+my @passwderrors = ("ok",
+		   "lcpasswd must be run as user 'www'",
+		   "lcpasswd got incorrect number of arguments",
+		   "lcpasswd did not get the right nubmer of input text lines",
+		   "lcpasswd too many simultaneous pwd changes in progress",
+		   "lcpasswd User does not exist.",
+		   "lcpasswd Incorrect current passwd",
+		   "lcpasswd Unable to su to root.",
+		   "lcpasswd Cannot set new passwd.",
+		   "lcpasswd Username has invalid characters",
+		   "lcpasswd Invalid characters in password",
+		    "11", "12",
+		    "lcpasswd Password mismatch");
+
+
+#  The array below are lcuseradd error strings.:
+
+my $lastadderror = 13;
+my @adderrors    = ("ok",
+		    "User ID mismatch, lcuseradd must run as user www",
+		    "lcuseradd Incorrect number of command line parameters must be 3",
+		    "lcuseradd Incorrect number of stdinput lines, must be 3",
+		    "lcuseradd Too many other simultaneous pwd changes in progress",
+		    "lcuseradd User does not exist",
+		    "lcuseradd Unabel to mak ewww member of users's group",
+		    "lcuseradd Unable to su to root",
+		    "lcuseradd Unable to set password",
+		    "lcuseradd Usrname has invbalid charcters",
+		    "lcuseradd Password has an invalid character",
+		    "lcuseradd User already exists",
+		    "lcuseradd Could not add user.",
+		    "lcuseradd Password mismatch");
+
+
+#
+#  Convert an error return code from lcpasswd to a string value.
+#
+sub lcpasswdstrerror {
+    my $ErrorCode = shift;
+    if(($ErrorCode < 0) || ($ErrorCode > $lastpwderror)) {
+	return "lcpasswd Unrecognized error return value ".$ErrorCode;
+    } else {
+	return $passwderrors($ErrorCode);
+    }
+}
+
+#
+# Convert an error return code from lcuseradd to a string value:
+#
+sub lcuseraddstrerror {
+    my $ErrorCode = shift;
+    if(($ErrorCode < 0) || ($ErrorCode > $lastadderror)) {
+	return "lcuseradd - Unrecognized error code: ".$ErrorCode;
+    } else {
+	return $adderrors($ErrorCode);
+    }
+}
+
 # grabs exception and records it to log before exiting
 sub catchexception {
     my ($error)=@_;
@@ -107,9 +169,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 +562,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);
@@ -660,7 +723,6 @@ sub make_new_child {
 			      $null=pack("C",0);
 			      unless ($upass=~/$null/) {
 				  my $krbclient=&Authen::Krb5::parse_name($uname.'@'.$contentpwd);
-				  &logthis("Realm ".$krbclient->realm);
 				  my $krbservice="krbtgt/".$contentpwd."\@".$contentpwd;
 				  my $krbserver=&Authen::Krb5::parse_name($krbservice);
 				  my $credentials=&Authen::Krb5::cc_default();
@@ -668,10 +730,10 @@ sub make_new_child {
 				  my $krbreturn = 
 				    &Authen::Krb5::get_in_tkt_with_password(
 				     $krbclient,$krbserver,$upass,$credentials);
-				  unless ($krbreturn) {
-				      &logthis("Krb5 Error: ".
-					       &Authen::Krb5::error());
-				  }
+#				  unless ($krbreturn) {
+#				      &logthis("Krb5 Error: ".
+#					       &Authen::Krb5::error());
+#				  }
 				  $pwdcorrect = ($krbreturn == 1);
 			   } else { $pwdcorrect=0; }
                           } elsif ($howpwd eq 'localauth') {
@@ -734,16 +796,18 @@ sub make_new_child {
 				      die "Cannot invoke authentication";
 				  print PWAUTH "$uname\n$upass\n";
 				  close PWAUTH;
-				  $pwdcorrect=!$?;
+				  my $pwdcorrect=!$?;
 			      }
 			     if ($pwdcorrect) {
 				 my $execdir=$perlvar{'lonDaemons'};
 				 my $pf = IO::File->new("|$execdir/lcpasswd");
 				 print $pf "$uname\n$npass\n$npass\n";
 				 close $pf;
-				 my $result = ($?>0 ? 'pwchange_failure' 
+				 my $err = $?;
+				 my $result = ($err>0 ? 'pwchange_failure' 
 					       : 'ok');
-				 &logthis("Result of password change for $uname: $result");
+				 &logthis("Result of password change for $uname: ".
+					  &lcpasswdstrerror($?));
 				 print $client "$result\n";
 			     } else {
 				 print $client "non_authorized\n";
@@ -815,7 +879,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 {
@@ -1630,6 +1695,10 @@ sub make_passwd_file {
 		print $se "$npass\n";
 		print $se "$npass\n";
 	    }
+	    my $useraddok = $?;
+	    if($useraddok > 0) {
+		&logthis("Failed lcuseradd: ".&lcuseraddstrerror($useraddok));
+	    }
 	    my $pf = IO::File->new(">$passfilename");
 	    print $pf "unix:\n";
 	}