open db if explicit mentioned

This commit is contained in:
chris2511 2004-02-06 18:59:16 +00:00
parent e21066dbef
commit 05d95ece9c
3 changed files with 11 additions and 5 deletions

3
debian/changelog vendored
View File

@ -13,8 +13,7 @@ xca (0.4.7-RC1) unstable; urgency=low
* OIDs for extended key usage and Distinguished name are
now read from eku.txt and dn.txt respectively.
* About dialog and help window added.
* Reqdetail is now tabdialog
*
* Requestdetail is now tabdialog
-- Christian Hohnstädt <christian@hohnstaedt.de> Thu, 5 Feb 2004 23:43:40 +0100

View File

@ -88,6 +88,8 @@ DbEnv *MainWindow::dbenv = NULL;
NIDlist *MainWindow::eku_nid = NULL;
NIDlist *MainWindow::dn_nid = NULL;
MainWindow::MainWindow(QWidget *parent, const char *name )
:MainWindow_UI(parent, name)
{
@ -95,7 +97,8 @@ MainWindow::MainWindow(QWidget *parent, const char *name )
dbfile = DBFILE;
dbenv = NULL;
global_tid = NULL;
force_load = 0;
baseDir = getBaseDir();
init_menu();
@ -114,8 +117,11 @@ MainWindow::MainWindow(QWidget *parent, const char *name )
read_cmdline();
if (exitApp) return;
init_baseDir();
// emit init_database();
if (force_load)
emit init_database();
}
void MainWindow::init_baseDir()
@ -260,7 +266,7 @@ void MainWindow::read_cmdline()
case '7' : lb = new load_pkcs7(); break;
case 'l' : lb = new load_crl(); break;
case 't' : lb = new load_temp(); break;
case 'd' : type = 1; break;
case 'd' : type = 1; force_load=1; break;
case 'b' : type = 2; break;
case 'v' : cerr << XCA_TITLE " Version " << VER << endl;
opt=0; exitApp=1; break;

View File

@ -80,6 +80,7 @@ class MainWindow: public MainWindow_UI
void init_baseDir();
DbTxn *global_tid;
QMenuBar *mb;
int force_load;
friend class pki_key;