--- loncom/auth/lonacc.pm	2002/06/15 19:20:14	1.32
+++ loncom/auth/lonacc.pm	2002/08/27 14:23:18	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.32 2002/06/15 19:20:14 www Exp $
+# $Id: lonacc.pm,v 1.35 2002/08/27 14:23:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,9 +83,6 @@ sub handler {
             }
             $ENV{'request.filename'} = $r->filename;
 
-            $ENV{'request.copyright'} = 
-		&Apache::lonnet::metadata($requrl,'copyright');
-
 # -------------------------------------------------------- Load POST parameters
 
 
@@ -210,7 +207,8 @@ sub handler {
     }
 
 # -------------------------------------------- See if this is a public resource
-    if (&Apache::lonnet::metadata($requrl,'copyright') eq 'public') {
+    if (($requrl=~/^\/public\//) || 
+        (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
         &Apache::lonnet::logthis('Granting public access: '.$requrl);
 	$ENV{'user.name'}='public';
         $ENV{'user.domain'}='public';
@@ -219,10 +217,17 @@ sub handler {
         $ENV{'request.filename'} = $r->filename;
         return OK;
     }
-# ----------------------------------------------- Store where they wanted to go
-    
-    $ENV{'request.firsturl'}=$requrl;
-    return FORBIDDEN;
+# -------------------------------------------------------------- Not authorized
+    $requrl=~/\.(\w+)$/;
+    if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
+        ($requrl=~/^\/adm\/(roles|logout)/)) {
+# -------------------------- Store where they wanted to go and get login screen
+       $ENV{'request.firsturl'}=$requrl;
+       return FORBIDDEN;
+   } else {
+# --------------------------------------------------------------------- Goodbye
+       return HTTP_BAD_REQUEST;
+   }
 }
 
 1;