--- loncom/lond	2002/09/09 14:04:02	1.95
+++ loncom/lond	2002/09/19 21:16:24	1.98
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.95 2002/09/09 14:04:02 harris41 Exp $
+# $Id: lond,v 1.98 2002/09/19 21:16:24 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)=@_;
@@ -697,7 +759,7 @@ sub make_new_child {
                        chomp($npass);
                        $upass=&unescape($upass);
                        $npass=&unescape($npass);
-		       &logthis("Trying to change password for $uname");
+		       &Debug("Trying to change password for $uname");
 		       my $proname=propath($udom,$uname);
                        my $passfilename="$proname/passwd";
                        if (-e $passfilename) {
@@ -707,6 +769,7 @@ sub make_new_child {
                           chomp($realpasswd);
                           my ($howpwd,$contentpwd)=split(/:/,$realpasswd);
                           if ($howpwd eq 'internal') {
+			   &Debug("internal auth");
 			   if (crypt($upass,$contentpwd) eq $contentpwd) {
 			     my $salt=time;
                              $salt=substr($salt,6,2);
@@ -723,6 +786,7 @@ sub make_new_child {
 			      # one way or another.
 			      # First: Make sure the current password is
 			      #        correct
+			      &Debug("auth is unix");
 			      $contentpwd=(getpwnam($uname))[1];
 			      my $pwdcorrect = "0";
 			      my $pwauth_path="/usr/local/sbin/pwauth";
@@ -734,16 +798,20 @@ sub make_new_child {
 				      die "Cannot invoke authentication";
 				  print PWAUTH "$uname\n$upass\n";
 				  close PWAUTH;
-				  $pwdcorrect=!$?;
+				  &Debug("exited pwauth with $? ($uname,$upass) ");
+				  $pwdcorrect=($? == 0);
 			      }
 			     if ($pwdcorrect) {
 				 my $execdir=$perlvar{'lonDaemons'};
-				 my $pf = IO::File->new("|$execdir/lcpasswd");
+				 &Debug("Opening lcpasswd pipeline");
+				 my $pf = IO::File->new("|$execdir/lcpasswd > /home/www/lcpasswd.log");
 				 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";
@@ -789,7 +857,7 @@ sub make_new_child {
                                }
                            }
                            unless ($fperror) {
-			       my $result=&make_passwd_file($umode,$npass,
+			       my $result=&make_passwd_file($uname, $umode,$npass,
 							    $passfilename);
 			       print $client $result;
                            } else {
@@ -815,7 +883,7 @@ sub make_new_child {
 		       if ($udom ne $perlvar{'lonDefDomain'}) {
                            print $client "not_right_domain\n";
                        } else {
-			   my $result=&make_passwd_file($umode,$npass,
+			   my $result=&make_passwd_file($uname, $umode,$npass,
 							$passfilename);
 			   print $client $result;
                        }
@@ -1600,7 +1668,7 @@ sub subscribe {
 }
 
 sub make_passwd_file {
-    my ($umode,$npass,$passfilename)=@_;
+    my ($uname, $umode,$npass,$passfilename)=@_;
     my $result="ok\n";
     if ($umode eq 'krb4' or $umode eq 'krb5') {
 	{
@@ -1626,11 +1694,16 @@ sub make_passwd_file {
 	    my $execpath="$perlvar{'lonDaemons'}/"."lcuseradd";
 	    {
 		&Debug("Executing external: ".$execpath);
-		my $se = IO::File->new("|$execpath");
+		&Debug("user  = ".$uname.", Password =". $npass);
+		my $se = IO::File->new("|$execpath > /home/www/lcuseradd.log");
 		print $se "$uname\n";
 		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";
 	}