Diff for /loncom/auth/lonauth.pm between versions 1.16 and 1.18

version 1.16, 2000/10/30 22:41:55 version 1.18, 2001/01/09 22:10:40
Line 3 Line 3
 # 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15  # 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15
 # 16/11,12/16,  # 16/11,12/16,
 # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,  # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,
 # 7/1,7/10,10/2,10/5,10/9,10/26,10/30 Gerd Kortemeyer  # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10 Gerd Kortemeyer
   
 package Apache::lonauth;  package Apache::lonauth;
   
   use strict;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::File;  use Apache::File;
 use CGI qw(:standard);  use CGI qw(:standard);
Line 14  use CGI::Cookie(); Line 15  use CGI::Cookie();
 use Crypt::DES;  use Crypt::DES;
 use Apache::lonnet();  use Apache::lonnet();
 use Apache::lonmenu();  use Apache::lonmenu();
   use Fcntl qw(:flock);
 # ------------------------------------------------------------ Successful login  # ------------------------------------------------------------ Successful login
   
 sub success {  sub success {
Line 22  sub success { Line 23  sub success {
     my $lonids=$r->dir_config('lonIDsDir');      my $lonids=$r->dir_config('lonIDsDir');
   
 # See if old ID present, if so, remove  # See if old ID present, if so, remove
     my $cookie;  
     while ($cookie=<$lonids/$username\_*\_$domain\_$authhost.id>) {      my $filename;
  unlink($cookie);      opendir(DIR,$lonids);
       while ($filename=readdir(DIR)) {
          if ($filename=~/^$username\_\d+\_$domain\_$authhost\.id$/) {
     unlink($lonids.'/'.$filename);
          }
     }      }
       closedir(DIR);
   
 # Give them a new cookie  # Give them a new cookie
   
       my $cookie;
     my $now=time;      my $now=time;
     $cookie="$username\_$now\_$domain\_$authhost";      $cookie="$username\_$now\_$domain\_$authhost";
   
Line 82  sub success { Line 89  sub success {
   
        {         {
     my $idf=Apache::File->new(">$lonids/$cookie.id");      my $idf=Apache::File->new(">$lonids/$cookie.id");
       unless (flock($idf,LOCK_EX)) {
         &Apache::lonnet::logthis("<font color=blue>WARNING: ".
          'Could not obtain exclusive lock in lonauth: '.$!);
         $idf->close();
         return 'error: '.$!;
       }
             if ($userenv ne '') { print $idf "$userenv\n"; }              if ($userenv ne '') { print $idf "$userenv\n"; }
             print $idf "user.name=$username\n";              print $idf "user.name=$username\n";
             print $idf "user.domain=$domain\n";              print $idf "user.domain=$domain\n";
Line 96  sub success { Line 109  sub success {
             print $idf "request.role=cm\n";              print $idf "request.role=cm\n";
             print $idf "request.host=$ENV{'HTTP_HOST'}\n";               print $idf "request.host=$ENV{'HTTP_HOST'}\n"; 
             if ($userroles ne '') { print $idf "$userroles"; }              if ($userroles ne '') { print $idf "$userroles"; }
       $idf->close();
         }          }
   
 # -------------------------------------------------------------------- Log this  # -------------------------------------------------------------------- Log this

Removed from v.1.16  
changed lines
  Added in v.1.18


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>