X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=blobdiff_plain;f=cgi-auth-flexible.pm;h=fb161cc8f315a5d2ea6f7c84e0bdec12725f08e6;hp=c7ded66d751abbe2049e579e7da05763e009af13;hb=588cf612c72b32638aab13de0e695e7173ffdd39;hpb=bf9d586441f4779065dd5566089a010a7d0755a7

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index c7ded66..fb161cc 100644
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -180,6 +180,7 @@ sub new_verifier {
     my $verifier = {
 	S => {
             dir => undef,
+	    assocdb_dbh => undef, # must have AutoCommit=0, RaiseError=1
 	    assocdb_path => 'caf-assocs.db',
 	    keys_path => 'caf-keys',
 	    assocdb_dsn => undef,
@@ -254,17 +255,23 @@ sub _dbopen ($) {
     my $dbh = $v->{Dbh};
     return $dbh if $dbh; 
 
-    $v->{S}{assocdb_dsn} ||= "dbi:SQLite:dbname=".$v->_get_path('assocdb');
-    my $dsn = $v->{S}{assocdb_dsn};
-
-    my $u = umask 077;
-    $dbh = DBI->connect($dsn, $v->{S}{assocdb_user}, 
-                        $v->{S}{assocdb_password}, { 
-                            AutoCommit => 0,
-                            RaiseError => 1,
-                            ShowErrorStatement => 1,
-                        });
-    die "$dsn $! ?" unless $dbh;
+    $dbh = $v->{S}{assocdb_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};
+
+        my $u = umask 077;
+        $dbh = DBI->connect($dsn, $v->{S}{assocdb_user},
+                            $v->{S}{assocdb_password}, {
+                                AutoCommit => 0,
+                                RaiseError => 1,
+                                ShowErrorStatement => 1,
+                            });
+        die "$dsn $! ?" unless $dbh;
+    }
     $v->{Dbh} = $dbh;
 
     $v->_db_setup_do("CREATE TABLE $v->{S}{assocdb_table} (".
@@ -999,6 +1006,8 @@ sub secret_cookie ($) {
     return $cookv;
 }
 
+1;
+
 __END__
 
 =head1 NAME