--- loncom/lond	2001/03/27 13:37:43	1.45
+++ loncom/lond	2001/10/23 04:38:45	1.53
@@ -14,6 +14,9 @@
 # 02/12 Gerd Kortemeyer
 # 03/15 Scott Harrison
 # 03/24 Gerd Kortemeyer
+# 04/02 Scott Harrison
+# 05/11,05/28,08/30 Gerd Kortemeyer
+# 9/30,10/22 Scott Harrison
 #
 # based on "Perl Cookbook" ISBN 1-56592-243-3
 # preforker - server who forks first
@@ -30,6 +33,8 @@ use Crypt::IDEA;
 use LWP::UserAgent();
 use GDBM_File;
 use Authen::Krb4;
+use lib '/home/httpd/lib/perl/';
+use localauth;
 
 # grabs exception and records it to log before exiting
 sub catchexception {
@@ -362,7 +367,8 @@ sub make_new_child {
             my $clientip=inet_ntoa($iaddr);
             my $clientrec=($hostid{$clientip} ne undef);
             &logthis(
-"<font color=yellow>INFO: Connect from $clientip ($hostid{$clientip})</font>");
+"<font color=yellow>INFO: Connection $i, $clientip ($hostid{$clientip})</font>"
+            );
             my $clientok;
             if ($clientrec) {
 	      my $remotereq=<$client>;
@@ -466,14 +472,27 @@ sub make_new_child {
 				  (crypt($upass,$contentpwd) eq $contentpwd);
                           } elsif ($howpwd eq 'unix') {
                               $contentpwd=(getpwnam($uname))[1];
-                              $pwdcorrect=
-                                  (crypt($upass,$contentpwd) eq $contentpwd);
+			      my $pwauth_path="/usr/local/sbin/pwauth";
+			      unless ($contentpwd eq 'x') {
+				  $pwdcorrect=
+                                    (crypt($upass,$contentpwd) eq $contentpwd);
+			      }
+			      elsif (-e $pwauth_path) {
+				  open PWAUTH, "|$pwauth_path" or
+				      die "Cannot invoke authentication";
+				  print PWAUTH "$uname\n$upass\n";
+				  close PWAUTH;
+				  $pwdcorrect=!$?;
+			      }
                           } elsif ($howpwd eq 'krb4') {
                               $pwdcorrect=(
                                  Authen::Krb4::get_pw_in_tkt($uname,"",
                                         $contentpwd,'krbtgt',$contentpwd,1,
 							     $upass) == 0);
-                          }
+                          } elsif ($howpwd eq 'localauth') {
+			    $pwdcorrect=&localauth::localauth($uname,$upass,
+							      $contentpwd);
+			  }
                           if ($pwdcorrect) {
                              print $client "authorized\n";
                           } else {
@@ -560,9 +579,26 @@ sub make_new_child {
                                { 
                                  my $pf = IO::File->new(">$passfilename");
  	  		         print $pf "internal:$ncpass\n"; 
-                               }             
+                               }
                                print $client "ok\n";
-                             } elsif ($umode eq 'none') {
+			     } elsif ($umode eq 'localauth') {
+			       {
+				 my $pf = IO::File->new(">$passfilename");
+  	  		         print $pf "localauth:$npass\n";
+			       }
+			       print $client "ok\n";
+			     } elsif ($umode eq 'unix') {
+			       {
+				 my $execpath="$perlvar{'lonDaemons'}/".
+				              "lcuseradd";
+			         my $se = IO::File->new("|$execpath");
+				 print $se "$uname\n";
+				 print $se "$npass\n";
+				 print $se "$npass\n";
+                                 my $pf = IO::File->new(">$passfilename");
+ 	  		         print $pf "unix:\n"; 
+			       }
+			     } elsif ($umode eq 'none') {
                                { 
                                  my $pf = IO::File->new(">$passfilename");
  	  		         print $pf "none:\n"; 
@@ -707,7 +743,7 @@ sub make_new_child {
                        chomp($what);
                        my $proname=propath($udom,$uname);
                        my $now=time;
-                       {
+                       unless ($namespace=~/^nohist\_/) {
 			   my $hfh;
 			   if (
                              $hfh=IO::File->new(">>$proname/$namespace.hist")
@@ -832,7 +868,7 @@ sub make_new_child {
                        chomp($what);
                        my $proname=propath($udom,$uname);
                        my $now=time;
-                       {
+                       unless ($namespace=~/^nohist\_/) {
 			   my $hfh;
 			   if (
                              $hfh=IO::File->new(">>$proname/$namespace.hist")
@@ -903,7 +939,7 @@ sub make_new_child {
                        chomp($what);
                        my $proname=propath($udom,$uname);
                        my $now=time;
-                       {
+                       unless ($namespace=~/^nohist\_/) {
 			   my $hfh;
 			   if (
                              $hfh=IO::File->new(">>$proname/$namespace.hist")
@@ -990,6 +1026,9 @@ sub make_new_child {
 			   $reply=~s/\&/\n/g;
 			   print $store $reply;
 			   close $store;
+			   my $store2=IO::File->new(">$execdir/tmp/$id.end");
+			   print $store2 "done\n";
+			   close $store2;
 			   print $client "ok\n";
 		       }
 		       else {
@@ -1085,7 +1124,7 @@ sub make_new_child {
                        if (-e $ulsdir) {
 			if (opendir(LSDIR,$ulsdir)) {
                           while ($ulsfn=readdir(LSDIR)) {
-			     my @ulsstats=stat($ulsfn);
+			     my @ulsstats=stat($ulsdir.'/'.$ulsfn);
                              $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
                           }
                           closedir(LSDIR);
@@ -1095,6 +1134,13 @@ sub make_new_child {
                        }
                        if ($ulsout eq '') { $ulsout='empty'; }
                        print $client "$ulsout\n";
+# ------------------------------------------------------------------ Hanging up
+                   } elsif (($userinput =~ /^exit/) ||
+                            ($userinput =~ /^init/)) {
+                       &logthis(
+      "Client $clientip ($hostid{$clientip}) hanging up: $userinput");
+                       print $client "bye\n";
+		       last;
 # ------------------------------------------------------------- unknown command
                    } else {
                        # unknown command