Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	16 Apr 2001 04:46:21 -0000	1.2
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	18 Apr 2001 15:28:19 -0000	1.3
@@ -121,7 +121,7 @@
 	]} {
 	    set system_file "$system_file.tcl"
 	}
-	acs_source "[acs_root_dir]/www/SYSTEM/$system_file"
+	apm_source "[acs_root_dir]/www/SYSTEM/$system_file"
 	return "filter_return"
     }
 
@@ -145,7 +145,7 @@
     ns_mutex lock [nsv_get acs_installer mutex]
     if { [catch {
 	# Source the page and then unlock the mutex.
-	acs_source $path
+	apm_source $path
 	ns_mutex unlock [nsv_get acs_installer mutex]
     } error] } {
 	# In case of an error, don't forget to unlock the mutex.
Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl	16 Apr 2001 04:46:21 -0000	1.2
+++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl	18 Apr 2001 15:28:19 -0000	1.3
@@ -30,14 +30,6 @@
     error "$path is not under the path root ([acs_root_dir])"
 }
 
-# A "safe" way to source a Tcl file. This is mainly so we can trace sourcing in the call stack,
-# which is fairly important in the QD, and generally a better idea for figuring out what the
-# heck is going on. (ben)
-proc acs_source { path } {
-    # That's right, that's all we're doing. Wrapping source so we can do call stack traces.
-    source $path
-}
-
 proc ad_parse_documentation_string { doc_string elements_var } {
     upvar $elements_var elements
     if { [info exists elements] } {
Index: openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql	17 Apr 2001 22:59:51 -0000	1.3
+++ openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql	18 Apr 2001 15:28:19 -0000	1.4
@@ -13,4 +13,12 @@
                       values (sec_security_token_id_seq.nextval, :random_token, now())
     </querytext>
   </fullquery>
+  <fullquery name="populate_secret_tokens_cache.get_secret_tokens">
+    <querytext>
+    select token_id, token
+    from secret_tokens,
+         (select trunc(random()*(select count(*)-15 from secret_tokens))::integer as first) r
+    where token_id >= r.first and r.first+15 > token_id;
+    </querytext>
+   </fullquery>
 </queryset>