projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix db4 backend - we weren't actually providing a suitable dbfuncs struct.
[onak.git]
/
lookup.c
diff --git
a/lookup.c
b/lookup.c
index d5392d599d318f806b059dd1e6fc043e0bfbed53..d48bc3f7cdbd30dfb428c1814d83e72c77ceb6ae 100644
(file)
--- a/
lookup.c
+++ b/
lookup.c
@@
-16,6
+16,8
@@
#include "armor.h"
#include "charfuncs.h"
#include "cleankey.h"
#include "armor.h"
#include "charfuncs.h"
#include "cleankey.h"
+#include "cleanup.h"
+#include "config.h"
#include "getcgi.h"
#include "keydb.h"
#include "keyindex.h"
#include "getcgi.h"
#include "keydb.h"
#include "keyindex.h"
@@
-38,9
+40,9
@@
void find_keys(char *search, uint64_t keyid, bool ishex,
int count = 0;
if (ishex) {
int count = 0;
if (ishex) {
- count = fetch_key(keyid, &publickey, false);
+ count =
config.dbbackend->
fetch_key(keyid, &publickey, false);
} else {
} else {
- count = fetch_key_text(search, &publickey);
+ count =
config.dbbackend->
fetch_key_text(search, &publickey);
}
if (publickey != NULL) {
if (mrhkp) {
}
if (publickey != NULL) {
if (mrhkp) {
@@
-102,7
+104,7
@@
int main(int argc, char *argv[])
search = params[i+1];
params[i+1] = NULL;
if (search != NULL) {
search = params[i+1];
params[i+1] = NULL;
if (search != NULL) {
- keyid = strtoul(search, &end, 16);
+ keyid = strtoul
l
(search, &end, 16);
if (*search != 0 &&
end != NULL &&
*end == 0) {
if (*search != 0 &&
end != NULL &&
*end == 0) {
@@
-156,12
+158,14
@@
int main(int argc, char *argv[])
} else {
readconfig(NULL);
initlogthing("lookup", config.logfile);
} else {
readconfig(NULL);
initlogthing("lookup", config.logfile);
- initdb(true);
+ catchsignals();
+ config.dbbackend->initdb(true);
switch (op) {
case OP_GET:
logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
keyid);
switch (op) {
case OP_GET:
logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
keyid);
- if (fetch_key(keyid, &publickey, false)) {
+ if (config.dbbackend->fetch_key(keyid, &publickey,
+ false)) {
puts("<pre>");
cleankeys(publickey);
flatten_publickey(publickey,
puts("<pre>");
cleankeys(publickey);
flatten_publickey(publickey,
@@
-186,7
+190,8
@@
int main(int argc, char *argv[])
true, mrhkp);
break;
case OP_PHOTO:
true, mrhkp);
break;
case OP_PHOTO:
- if (fetch_key(keyid, &publickey, false)) {
+ if (config.dbbackend->fetch_key(keyid, &publickey,
+ false)) {
unsigned char *photo = NULL;
size_t length = 0;
unsigned char *photo = NULL;
size_t length = 0;
@@
-203,13
+208,14
@@
int main(int argc, char *argv[])
default:
puts("Unknown operation!");
}
default:
puts("Unknown operation!");
}
- cleanupdb();
+ c
onfig.dbbackend->c
leanupdb();
cleanuplogthing();
cleanupconfig();
}
if (!mrhkp) {
puts("<hr>");
cleanuplogthing();
cleanupconfig();
}
if (!mrhkp) {
puts("<hr>");
- puts("Produced by onak " VERSION " by Jonathan McDowell");
+ puts("Produced by onak " PACKAGE_VERSION
+ " by Jonathan McDowell");
end_html();
}
end_html();
}