mirror of
https://github.com/Yubico/yubikey-ksm.git
synced 2025-02-22 00:54:27 +01:00
Fixed scripts failing when db config exists but isn't readable.
This commit is contained in:
parent
dcc017f5af
commit
29dd8a2f47
@ -57,7 +57,7 @@ sub usage {
|
|||||||
|
|
||||||
#Support dbconfig-common generated database settings, if available
|
#Support dbconfig-common generated database settings, if available
|
||||||
our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
|
our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
|
||||||
if( -e '/etc/yubico/ksm/config-db.cfg' ) {
|
if( -r '/etc/yubico/ksm/config-db.cfg' ) {
|
||||||
require '/etc/yubico/ksm/config-db.cfg';
|
require '/etc/yubico/ksm/config-db.cfg';
|
||||||
} else {
|
} else {
|
||||||
$dbtype = 'mysql';
|
$dbtype = 'mysql';
|
||||||
|
@ -55,7 +55,7 @@ sub usage {
|
|||||||
|
|
||||||
#Support dbconfig-common generated database settings, if available
|
#Support dbconfig-common generated database settings, if available
|
||||||
our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
|
our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
|
||||||
if( -e '/etc/yubico/ksm/config-db.cfg' ) {
|
if( -r '/etc/yubico/ksm/config-db.cfg' ) {
|
||||||
require '/etc/yubico/ksm/config-db.cfg';
|
require '/etc/yubico/ksm/config-db.cfg';
|
||||||
} else {
|
} else {
|
||||||
$dbtype = 'mysql';
|
$dbtype = 'mysql';
|
||||||
|
@ -59,7 +59,7 @@ sub usage {
|
|||||||
|
|
||||||
#Support dbconfig-common generated database settings, if available
|
#Support dbconfig-common generated database settings, if available
|
||||||
our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
|
our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
|
||||||
if( -e '/etc/yubico/ksm/config-db.cfg' ) {
|
if( -r '/etc/yubico/ksm/config-db.cfg' ) {
|
||||||
require '/etc/yubico/ksm/config-db.cfg';
|
require '/etc/yubico/ksm/config-db.cfg';
|
||||||
} else {
|
} else {
|
||||||
$dbtype = 'mysql';
|
$dbtype = 'mysql';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user