X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=cgi-auth-flexible.pm;h=dd917c77e24355e0a9b3b110a3d1ba045dec0253;hb=ef6bf73ea7ca6e945c9673bc2a6fd711d0d8e9d1;hp=65a929fda48af18210b7f45c7509298df6353299;hpb=d1ac338fe76009ab1f28e8a43665e67d5d2341f6;p=cgi-auth-flexible.git

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index 65a929f..dd917c7 100644
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -431,15 +431,15 @@ sub new_verifier {
     my $verifier = {
 	S => {
             dir => undef,
-	    assocdb_dbh => undef, # must have AutoCommit=0, RaiseError=1
-	    assocdb_path => 'caf-assocs.db',
+	    db_dbh => undef, # must have AutoCommit=0, RaiseError=1
+	    db_path => 'caf.db',
 	    keys_path => 'caf-keys',
 	    srcdump_path => 'caf-srcdump',
-	    assocdb_dsn => undef,
-	    assocdb_user => '',
-	    assocdb_password => '',
+	    db_dsn => undef,
+	    db_user => '',
+	    db_password => '',
 	    db_prefix => 'caf',
-	    assocdb_setup_stmts => [@_default_db_setup_statements],
+	    db_setup_stmts => [@_default_db_setup_statements],
 	    random_source => '/dev/urandom',
 	    secretbits => 128, # bits
 	    hash_algorithm => "SHA-256",
@@ -536,17 +536,17 @@ sub _dbopen ($) {
     my $dbh = $v->{Dbh};
     return $dbh if $dbh; 
 
-    $dbh = $v->{S}{assocdb_dbh};
+    $dbh = $v->{S}{db_dbh};
     if ($dbh) {
         die if $dbh->{AutoCommit};
         die unless $dbh->{RaiseError};
     } else {
-        $v->{S}{assocdb_dsn} ||= "dbi:SQLite:dbname=".$v->_get_path('assocdb');
-        my $dsn = $v->{S}{assocdb_dsn};
+        $v->{S}{db_dsn} ||= "dbi:SQLite:dbname=".$v->_get_path('db');
+        my $dsn = $v->{S}{db_dsn};
 
         my $u = umask 077;
-        $dbh = DBI->connect($dsn, $v->{S}{assocdb_user},
-                            $v->{S}{assocdb_password}, {
+        $dbh = DBI->connect($dsn, $v->{S}{db_user},
+                            $v->{S}{db_password}, {
                                 AutoCommit => 0,
                                 RaiseError => 1,
                                 ShowErrorStatement => 1,