--- loncom/auth/lonauth.pm	2001/08/04 00:39:32	1.22
+++ loncom/auth/lonauth.pm	2001/10/08 22:37:50	1.26
@@ -7,6 +7,8 @@
 # 05/28,05/29 Gerd Kortemeyer
 # 07/24 Scott Harrison
 # 07/28,08/03 Gerd Kortemeyer
+# 8/15 Scott Harrison
+# 8/20 Gerd Kortemeyer
 
 package Apache::lonauth;
 
@@ -15,6 +17,7 @@ use Apache::Constants qw(:common);
 use Apache::File;
 use CGI qw(:standard);
 use CGI::Cookie();
+use DynaLoader; # for Crypt::DES version
 use Crypt::DES;
 use Apache::lonnet();
 use Apache::lonmenu();
@@ -172,7 +175,7 @@ function wait() {
 }
 
 function main() {
-   canceltim=setTimeout('tim=1;',20000);
+   canceltim=setTimeout('tim=1;',80000);
    checkdef();
    wait();
 }
@@ -257,7 +260,13 @@ sub handler {
 
     my $keybin=pack("H16",$key);
 
-    my $cipher=new DES $keybin;
+    my $cipher;
+    if ($Crypt::DES::VERSION>=2.03) {
+	$cipher=new Crypt::DES $keybin;
+    }
+    else {
+	$cipher=new DES $keybin;
+    }
 
     my $upass=$cipher->decrypt(
        unpack("a8",pack("H16",substr($FORM{'upass'},0,16))));
@@ -280,7 +289,7 @@ sub handler {
     }
 
     if (($firsturl eq '') || ($firsturl eq '/adm/logout')) {
-	$firsturl='/res/adm/pages/index.html';
+	$firsturl='/adm/roles';
     }
 
     success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);