--- loncom/Attic/srm.conf	2001/05/21 20:26:04	1.15
+++ loncom/Attic/srm.conf	2001/07/18 20:08:34	1.22
@@ -309,10 +309,13 @@ SetHandler perl-script
 PerlHandler Apache::lonratsrv
 </LocationMatch>
 
-<LocationMatch "^/\~.*\/ratparms$">
+<Location /adm/ratparms>
+PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonratparms
-</LocationMatch>
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
 
 # --------------------------------------------- Resource Space Content Handlers
 
@@ -346,11 +349,19 @@ SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.(problem|exam|quiz|assess|survey|form)$">
+<LocationMatch "^/(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
 
+<LocationMatch "^/adm/wrapper/">
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonwrapper
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
 # -------------------------------------------------------------- Admin Programs
 
 <Location /adm/statistics>
@@ -473,8 +484,8 @@ ErrorDocument     406 /adm/unauthorized.
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<LocationMatch "^(/\~.*/|/adm/pubdir)$">
-PerlAccessHandler       Apache::lonacc
+<LocationMatch "^/\~.*/$">
+PerlAccessHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
@@ -483,6 +494,16 @@ ErrorDocument     406 /adm/unauthorized.
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<Location /adm/pubdir>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpubdir
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/retrieve>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -493,6 +514,16 @@ ErrorDocument     406 /adm/unauthorized.
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/cfile>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncfile
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized.html
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/diff>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -558,14 +589,6 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/mydesk>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonmydesk
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/printout>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script