--- loncom/lonnet/perl/lonnet.pm 1999/10/13 17:48:51 1.1 +++ loncom/lonnet/perl/lonnet.pm 1999/11/08 16:20:35 1.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30, -# 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19 Gerd Kortemeyer +# 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19,11/8 Gerd Kortemeyer package Apache::lonnet; @@ -171,25 +171,17 @@ sub authenticate { if (($perlvar{'lonRole'} eq 'library') && ($udom eq $perlvar{'lonDefDomain'})) { - my $subdir=$uname; - $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/; - my $passfilename="$perlvar{'lonUsersDir'}/$udom/$subdir/$uname/passwd"; - if (-e $passfilename) { - my $pf = Apache::File->new($passfilename); - my $realpasswd=<$pf>; - chomp($realpasswd); - if ( $realpasswd eq $upass ) { - return $perlvar{'lonHostID'}; - } else { - return 'no_host'; - } - } + my $answer=reply("enc:auth:$udom:$uname:$upass",$perlvar{'lonHostID'}); + if ($answer =~ /authorized/) { + if ($answer eq 'authorized') { return $perlvar{'lonHostID'}; } + if ($answer eq 'non_authorized') { return 'no_host'; } + } } my $tryserver; foreach $tryserver (keys %libserv) { if ($hostdom{$tryserver} eq $udom) { - my $answer=reply("auth:$udom:$uname:$upass",$tryserver); + my $answer=reply("enc:auth:$udom:$uname:$upass",$tryserver); if ($answer =~ /authorized/) { if ($answer eq 'authorized') { return $tryserver; } }