X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_db2.c;h=771b2a5e0f1e2938e62efd86b5e897ea8620fbe2;hb=8e58a1769ce5e492dd68904dfc81b6e077fc2a3a;hp=6aa47c099b34973ac319cd61e02965ad41101f15;hpb=4b8483ae278577a3adc8d84da81d77019704466f;p=onak.git

diff --git a/keydb_db2.c b/keydb_db2.c
index 6aa47c0..771b2a5 100644
--- a/keydb_db2.c
+++ b/keydb_db2.c
@@ -21,9 +21,9 @@
 #include "keyindex.h"
 #include "keystructs.h"
 #include "mem.h"
+#include "onak_conf.h"
 #include "parsekey.h"
 
-#define DBDIR "/community/pgp-keyserver/db-copy"
 #define KEYDB_KEYID_BYTES 4
 
 /**
@@ -111,7 +111,8 @@ void initdb(void)
 	 */
 	db2_env.mp_size = 20 * 1024 * 1024;
 
-	ret = db_appinit(DBDIR, NULL, &db2_env, DB_INIT_MPOOL|DB_INIT_LOCK);
+	ret = db_appinit(config.db2_dbpath, NULL,
+			&db2_env, DB_INIT_MPOOL|DB_INIT_LOCK);
 	if (!ret) {
 		db2_keydbfiles = (DB **) malloc(sizeof (DB *) * db2_numdb);
 		memset(&keydbinfo, 0, sizeof(keydbinfo));
@@ -226,4 +227,6 @@ int delete_key(uint64_t keyid)
 /*
  * Include the basic keydb routines.
  */
+#define NEED_KEYID2UID 1
+#define NEED_GETKEYSIGS 1
 #include "keydb.c"