Index: openacs-4/packages/acs-core-docs/www/security-design.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/security-design.html,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-core-docs/www/security-design.html	17 Oct 2001 20:39:26 -0000	1.2
+++ openacs-4/packages/acs-core-docs/www/security-design.html	19 Dec 2001 18:33:22 -0000	1.3
@@ -172,7 +172,7 @@
     token_id                    integer
                                 constraint secret_tokens_token_id_pk primary key,
     token                       char(40),
-    timestamp               sysdate
+    token_timestamp             sysdate
 );
 
 </pre></td></tr></table></blockquote><p><tt>ad_verify_signature</tt> takes a value and a signature and
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/security-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/security-design.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-core-docs/www/xml/kernel/security-design.xml	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/security-design.xml	19 Dec 2001 18:33:22 -0000	1.2
@@ -514,7 +514,7 @@
     token_id                    integer
                                 constraint secret_tokens_token_id_pk primary key,
     token                       char(40),
-    timestamp               sysdate
+    token_timestamp             sysdate
 );
 
 </programlisting>
Index: openacs-4/packages/acs-kernel/sql/oracle/security-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/security-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/security-create.sql	20 Mar 2001 22:51:56 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/security-create.sql	19 Dec 2001 18:33:22 -0000	1.2
@@ -41,7 +41,7 @@
     token_id                    integer
                                 constraint secret_tokens_token_id_pk primary key,
     token                       char(40),
-    timestamp			date
+    token_timestamp		date
 );
 
 create sequence sec_security_token_id_seq cache 100;
Index: openacs-4/packages/acs-kernel/sql/postgresql/postgresql.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/postgresql.sql,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-kernel/sql/postgresql/postgresql.sql	14 Dec 2001 03:22:03 -0000	1.22
+++ openacs-4/packages/acs-kernel/sql/postgresql/postgresql.sql	19 Dec 2001 18:33:22 -0000	1.23
@@ -691,6 +691,7 @@
           on a.attrelid = c.oid 
         where a.attnum > 0'';
   end if;
+  return ''t'';
 end;' language 'plpgsql';
 
 select create_user_col_comments();
Index: openacs-4/packages/acs-kernel/sql/postgresql/security-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/security-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/sql/postgresql/security-create.sql	28 Apr 2001 17:35:30 -0000	1.3
+++ openacs-4/packages/acs-kernel/sql/postgresql/security-create.sql	19 Dec 2001 18:33:22 -0000	1.4
@@ -35,7 +35,7 @@
     token_id                    integer
                                 constraint secret_tokens_token_id_pk primary key,
     token                       char(40),
-    timestamp                    timestamp
+    token_timestamp             timestamp
 );
 
 create sequence t_sec_security_token_id_seq cache 100;
Index: openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql	24 Apr 2001 06:02:27 -0000	1.1
+++ openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql	19 Dec 2001 18:33:22 -0000	1.2
@@ -33,7 +33,7 @@
 <fullquery name="populate_secret_tokens_db.insert_random_token">      
       <querytext>
       
-	    insert /*+ APPEND */ into secret_tokens(token_id, token, timestamp)
+	    insert /*+ APPEND */ into secret_tokens(token_id, token, token_timestamp)
 	    values(sec_security_token_id_seq.nextval, :random_token, sysdate)
 	
       </querytext>
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.6 -r1.7
--- openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql	24 Apr 2001 06:02:27 -0000	1.6
+++ openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql	19 Dec 2001 18:33:22 -0000	1.7
@@ -33,7 +33,7 @@
 <fullquery name="populate_secret_tokens_db.insert_random_token">      
       <querytext>
 
-	    insert into secret_tokens(token_id, token, timestamp)
+	    insert into secret_tokens(token_id, token, token_timestamp)
 	    values(sec_security_token_id_seq.nextval, :random_token, now())
 	
       </querytext>
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	17 Apr 2001 22:59:51 -0000	1.2
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	19 Dec 2001 18:33:22 -0000	1.3
@@ -1252,12 +1252,12 @@
 	set random_token [sec_random_token]
 
 	db_dml insert_random_token {
-	    insert /*+ APPEND */ into secret_tokens(token_id, token, timestamp)
+	    insert /*+ APPEND */ into secret_tokens(token_id, token, token_timestamp)
 	    values(sec_security_token_id_seq.nextval, :random_token, sysdate)
 	}
 	incr counter
     }
 
     db_release_unused_handles
 
-}
\ No newline at end of file
+}
Index: openacs-4/packages/acs-tcl/tcl/security-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/tcl/security-procs.xql	24 Apr 2001 06:02:27 -0000	1.1
+++ openacs-4/packages/acs-tcl/tcl/security-procs.xql	19 Dec 2001 18:33:22 -0000	1.2
@@ -64,7 +64,7 @@
 <fullquery name="sec_get_token.get_token">      
       <querytext>
       select token from secret_tokens
-                       	                 where token_id = :token_id
+      where token_id = :token_id
       </querytext>
 </fullquery>