--- loncom/lond	2001/05/11 19:31:25	1.47
+++ loncom/lond	2001/08/30 20:02:28	1.51
@@ -15,7 +15,7 @@
 # 03/15 Scott Harrison
 # 03/24 Gerd Kortemeyer
 # 04/02 Scott Harrison
-# 05/11 Gerd Kortemeyer
+# 05/11,05/28,08/30 Gerd Kortemeyer
 #
 # based on "Perl Cookbook" ISBN 1-56592-243-3
 # preforker - server who forks first
@@ -32,6 +32,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 {
@@ -364,7 +366,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>;
@@ -475,7 +478,10 @@ sub make_new_child {
                                  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 {
@@ -562,8 +568,14 @@ sub make_new_child {
                                { 
                                  my $pf = IO::File->new(">$passfilename");
  	  		         print $pf "internal:$ncpass\n"; 
-                               }             
+                               }
                                print $client "ok\n";
+			     } elsif ($umode eq 'localauth') {
+			       {
+				 my $pf = IO::File->new(">$passfilename");
+  	  		         print $pf "localauth:$npass\n";
+			       }
+			       print $client "ok\n";
                              } elsif ($umode eq 'none') {
                                { 
                                  my $pf = IO::File->new(">$passfilename");
@@ -709,7 +721,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")
@@ -834,7 +846,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")
@@ -905,7 +917,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")
@@ -1100,6 +1112,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