From d1ac338fe76009ab1f28e8a43665e67d5d2341f6 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 7 Apr 2013 17:51:29 +0100
Subject: [PATCH] db_prefix setting: change from assocdb_table

---
 caf.pod              |  2 +-
 cgi-auth-flexible.pm | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/caf.pod b/caf.pod
index 2088fe5..ebbfd74 100644
--- a/caf.pod
+++ b/caf.pod
@@ -785,7 +785,7 @@ Used only if neither C<assocdb_dbh> or C<assocdb_dsn> are supplied.
 
 If this is a relative path, it is in C<dir>.
 
-=item C<assocdb_table>
+=item C<db_prefix>
 
 Prefix for the SQL tables and indices to use (and to create, if
 necessary).
diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index 940e5dc..65a929f 100644
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -203,14 +203,14 @@ sub gen_plain_footer_html ($$) {
 }
 
 our @default_db_setup_stmts =
-    ("CREATE TABLE $v->{S}{assocdb_table} (".
+    ("CREATE TABLE $v->{S}{db_prefix}_assocs (".
      " assochash VARCHAR PRIMARY KEY,".
      " username VARCHAR NOT NULL,".
      " last INTEGER NOT NULL".
      ")"
      ,
-     "CREATE INDEX $v->{S}{assocdb_table}_timeout_index".
-     " ON $v->{S}{assocdb_table}".
+     "CREATE INDEX $v->{S}{db_prefix}_assocs_timeout_index".
+     " ON $v->{S}{db_prefix}_assocs".
      " (last)"
     );
 
@@ -438,7 +438,7 @@ sub new_verifier {
 	    assocdb_dsn => undef,
 	    assocdb_user => '',
 	    assocdb_password => '',
-	    assocdb_table => 'caf_assocs',
+	    db_prefix => 'caf',
 	    assocdb_setup_stmts => [@_default_db_setup_statements],
 	    random_source => '/dev/urandom',
 	    secretbits => 128, # bits
@@ -964,12 +964,12 @@ sub _identify ($$) {
 
     my $dbh = $r->{Dbh};
 
-    $dbh->do("DELETE FROM $r->{S}{assocdb_table}".
+    $dbh->do("DELETE FROM $r->{S}{db_prefix}_assocs".
              " WHERE last < ?", {},
              time - $r->{S}{login_timeout});
 
     my $row = $dbh->selectrow_arrayref("SELECT username, last".
-			      " FROM $r->{S}{assocdb_table}".
+			      " FROM $r->{S}{db_prefix}_assocs".
 			      " WHERE assochash = ?", {}, $h);
     if (defined $row) {
 #print STDERR "_identify h=$h s=$s YES @$row\n";
@@ -1010,7 +1010,7 @@ sub _db_revoke ($$) {
 
     my $dbh = $r->{Dbh};
 
-    $dbh->do("DELETE FROM $r->{S}{assocdb_table}".
+    $dbh->do("DELETE FROM $r->{S}{db_prefix}_assocs".
 	     " WHERE assochash = ?", {}, $h);
 }
 
@@ -1018,7 +1018,7 @@ sub _db_record_login_ok ($$$) {
     my ($r,$h,$user) = @_;
     $r->_db_revoke($h);
     my $dbh = $r->{Dbh};
-    $dbh->do("INSERT INTO $r->{S}{assocdb_table}".
+    $dbh->do("INSERT INTO $r->{S}{db_prefix}_assocs".
 	     " (assochash, username, last) VALUES (?,?,?)", {},
 	     $h, $user, time);
 }
-- 
2.30.2