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 e5cd1ae8e79f452cbd91169ba46db992cede62fd..d48bc3f7cdbd30dfb428c1814d83e72c77ceb6ae 100644
(file)
--- a/
lookup.c
+++ b/
lookup.c
@@
-40,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) {
@@
-159,12
+159,13
@@
int main(int argc, char *argv[])
readconfig(NULL);
initlogthing("lookup", config.logfile);
catchsignals();
readconfig(NULL);
initlogthing("lookup", config.logfile);
catchsignals();
- initdb(true);
+
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,
@@
-189,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;
@@
-206,7
+208,7
@@
int main(int argc, char *argv[])
default:
puts("Unknown operation!");
}
default:
puts("Unknown operation!");
}
- cleanupdb();
+ c
onfig.dbbackend->c
leanupdb();
cleanuplogthing();
cleanupconfig();
}
cleanuplogthing();
cleanupconfig();
}