db_... settings: rename file from assocdb_...

diff --git a/caf.pod b/caf.pod
index 216410332ba969741638bbd470be110c907944fd..2f0614a5a0455fe24d0f5e0ebd2f3583fd1cca00 100644 (file)
--- a/caf.pod
+++ b/caf.pod
@@ -752,7 +752,7 @@ path settings are relative values.
 
 Must be an absolute filename.
 
 
 Must be an absolute filename.
 

-=item C<assocdb_dbh>
+=item C<db_dbh>

 
 CGI::Auth::Flexible needs a database for recording users' login
 session.  This database needs to be shared across all instances of the
 
 CGI::Auth::Flexible needs a database for recording users' login
 session.  This database needs to be shared across all instances of the


@@ -766,22 +766,22 @@ particular, there is no need for transactional integrity across
 changes made by CAF and your own application.)
 
 By default, CAF uses a sqlite3 database stored on local disk in the
 changes made by CAF and your own application.)
 
 By default, CAF uses a sqlite3 database stored on local disk in the

-file named by C<assocdb_path>.  This will be suitable for all
+file named by C<db_path>.  This will be suitable for all

 applications which run on a single host.
 
 This value, if supplied, should be a DBI handle for the database.
 
 applications which run on a single host.
 
 This value, if supplied, should be a DBI handle for the database.
 

-=item C<assocdb_dsn>
+=item C<db_dsn>

 
 This is the DSN to pass to C<< DBI->connect >>.  Used only if
 
 This is the DSN to pass to C<< DBI->connect >>.  Used only if

-C<assocdb_dbh> is not supplied.
+C<db_dbh> is not supplied.

 
 

-=item C<assocdb_path>
+=item C<db_path>

 
 Path to the sqlite3 database used for CAF's session storage.  The
 default is C<caf.db>.
 
 
 Path to the sqlite3 database used for CAF's session storage.  The
 default is C<caf.db>.
 

-Used only if neither C<assocdb_dbh> or C<assocdb_dsn> are supplied.
+Used only if neither C<db_dbh> or C<db_dsn> are supplied.

 
 If this is a relative path, it is in C<dir>.
 
 
 If this is a relative path, it is in C<dir>.
 


@@ -1320,7 +1320,7 @@ reported anywhere.
 
 If you use a different database, or just prefer to do things
 differently, you can set up the tables yourself and/or disable or
 
 If you use a different database, or just prefer to do things
 differently, you can set up the tables yourself and/or disable or

-modify the default setup statements, via the C<assocdb_setup_stmts>
+modify the default setup statements, via the C<db_setup_stmts>

 setting.
 
 The tables needed are:
 setting.
 
 The tables needed are:


@@ -1331,7 +1331,7 @@ xxx make _db_setup_do explicitly overrideable
 
 
 xxx remaining settings
 
 
 xxx remaining settings

- assocdb_password
+ db_password

  username_password_error
  login_ok
  get_cookie_domain
  username_password_error
  login_ok
  get_cookie_domain


@@ -1349,4 +1349,3 @@ xxx bugs wrong default random on *BSD
 xxx bugs keys not shared should be in db
 xxx rename caf_assocsecret default cookie name
 xxx mention relationship between login_timeout and cookies
 xxx bugs keys not shared should be in db
 xxx rename caf_assocsecret default cookie name
 xxx mention relationship between login_timeout and cookies

-xxx rename assocdb settings to db

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index 1d23ae7f7d3844fb17720e9a4e948dda5a8114c9..dd917c77e24355e0a9b3b110a3d1ba045dec0253 100644 (file)
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -431,15 +431,15 @@ sub new_verifier {
     my $verifier = {
        S => {
             dir => undef,
     my $verifier = {
        S => {
             dir => undef,

-           assocdb_dbh => undef, # must have AutoCommit=0, RaiseError=1
-           assocdb_path => 'caf.db',
+           db_dbh => undef, # must have AutoCommit=0, RaiseError=1
+           db_path => 'caf.db',

            keys_path => 'caf-keys',
            srcdump_path => 'caf-srcdump',
            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',
            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",
            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; 
 
     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 {
     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;
 
         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,
                                 AutoCommit => 0,
                                 RaiseError => 1,
                                 ShowErrorStatement => 1,