projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove keydctl.o in clean rule
[onak.git]
/
lookup.c
diff --git
a/lookup.c
b/lookup.c
index d48bc3f7cdbd30dfb428c1814d83e72c77ceb6ae..9bafcc8950258932830d1ed436e01711f56650a1 100644
(file)
--- a/
lookup.c
+++ b/
lookup.c
@@
-17,7
+17,6
@@
#include "charfuncs.h"
#include "cleankey.h"
#include "cleanup.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"
@@
-26,6
+25,7
@@
#include "onak-conf.h"
#include "parsekey.h"
#include "photoid.h"
#include "onak-conf.h"
#include "parsekey.h"
#include "photoid.h"
+#include "version.h"
#define OP_UNKNOWN 0
#define OP_GET 1
#define OP_UNKNOWN 0
#define OP_GET 1
@@
-87,6
+87,7
@@
int main(int argc, char *argv[])
struct openpgp_publickey *publickey = NULL;
struct openpgp_packet_list *packets = NULL;
struct openpgp_packet_list *list_end = NULL;
struct openpgp_publickey *publickey = NULL;
struct openpgp_packet_list *packets = NULL;
struct openpgp_packet_list *list_end = NULL;
+ int result;
params = getcgivars(argc, argv);
for (i = 0; params != NULL && params[i] != NULL; i += 2) {
params = getcgivars(argc, argv);
for (i = 0; params != NULL && params[i] != NULL; i += 2) {
@@
-159,13
+160,24
@@
int main(int argc, char *argv[])
readconfig(NULL);
initlogthing("lookup", config.logfile);
catchsignals();
readconfig(NULL);
initlogthing("lookup", config.logfile);
catchsignals();
- config.dbbackend->initdb(
tru
e);
+ config.dbbackend->initdb(
fals
e);
switch (op) {
case OP_GET:
switch (op) {
case OP_GET:
- logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
+ if (ishex) {
+ logthing(LOGTHING_NOTICE,
+ "Getting keyid 0x%" PRIX64,
keyid);
keyid);
- if (config.dbbackend->fetch_key(keyid, &publickey,
- false)) {
+ result = config.dbbackend->fetch_key(keyid,
+ &publickey, false);
+ } else {
+ logthing(LOGTHING_NOTICE,
+ "Getting key(s) for search text %s",
+ search);
+ result = config.dbbackend->fetch_key_text(
+ search,
+ &publickey);
+ }
+ if (result) {
puts("<pre>");
cleankeys(publickey);
flatten_publickey(publickey,
puts("<pre>");
cleankeys(publickey);
flatten_publickey(publickey,
@@
-195,7
+207,8
@@
int main(int argc, char *argv[])
unsigned char *photo = NULL;
size_t length = 0;
unsigned char *photo = NULL;
size_t length = 0;
- if (getphoto(publickey, 0, &photo, &length)) {
+ if (getphoto(publickey, indx, &photo,
+ &length)) {
fwrite(photo,
1,
length,
fwrite(photo,
1,
length,
@@
-214,7
+227,7
@@
int main(int argc, char *argv[])
}
if (!mrhkp) {
puts("<hr>");
}
if (!mrhkp) {
puts("<hr>");
- puts("Produced by onak "
PACKAGE
_VERSION
+ puts("Produced by onak "
ONAK
_VERSION
" by Jonathan McDowell");
end_html();
}
" by Jonathan McDowell");
end_html();
}